kelvin/wms-gj-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
刘名喜 2024-12-19 10:00:42 +08:00
commit b515389f38
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@ -1,2 +1,10 @@
<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">工刀具库WMS</h1> <h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">工具库WMS</h1>
<p align="center"> <p align="center">
# 项目启动
## 1. 拉取Maven依赖
## 2. 手动添加DM依赖
### Hibernate5.4
`mvn install:install-file -Dfile=[jar包路径] -DgroupId=com.dm.dialect -DartifactId=hibernate5 -Dversion=5.4 -Dpackaging=jar`
### DmJdbc
`mvn install:install-file -Dfile=[jar包路径] -DgroupId=com.dm -DartifactId=DmJdbcDriver -Dversion=1.8 -Dpackaging=jar`

11
ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmsInTaskController.java
View File

@ -42,6 +42,7 @@ public class WmsInTaskController extends BaseController {
private final IWmsInPlanDetailEntityService wmsInPlanDetailEntityService; private final IWmsInPlanDetailEntityService wmsInPlanDetailEntityService;
private final IUcmCtBaseService ucmCtBaseService; private final IUcmCtBaseService ucmCtBaseService;
private final IWmStorageLocationService wmStorageLocationService; private final IWmStorageLocationService wmStorageLocationService;
private final IUcmCtBaseService umcCtBaseService;
/** /**
* 查询入库任务列表 * 查询入库任务列表
@ -235,6 +236,11 @@ public class WmsInTaskController extends BaseController {
}); });
mdItemService.updateMdItem(mbbBdMrlMitm); mdItemService.updateMdItem(mbbBdMrlMitm);
} else if (Objects.equals(wmsInTask.getPlanTypeCode(), "CGRK")) { } else if (Objects.equals(wmsInTask.getPlanTypeCode(), "CGRK")) {
// 将库位信息填充至，料箱
UcmCtBase ucmCtBase = ucmCtBaseService.selectUcmCtBaseByCode(wmsInTask.getBoxRfid());
ucmCtBase.setAttr1(wmsInTask.getCellTgt().toString());
ucmCtBaseService.updateUcmCtBase(ucmCtBase);
// 插入台账数据
wmsInPlanDetailEntityList.forEach(planDetailEntity -> { wmsInPlanDetailEntityList.forEach(planDetailEntity -> {
BaseKnife baseKnife = baseKnifeService.selectBaseKnifeByBaseKnifeId(planDetailEntity.getKnifeId()); BaseKnife baseKnife = baseKnifeService.selectBaseKnifeByBaseKnifeId(planDetailEntity.getKnifeId());
// 设置状态为 解锁 // 设置状态为 解锁
@ -247,6 +253,11 @@ public class WmsInTaskController extends BaseController {
baseKnifeService.updateBaseKnife(baseKnife); baseKnifeService.updateBaseKnife(baseKnife);
}); });
} else if (Objects.equals(wmsInTask.getPlanTypeCode(), "GJHK")) { } else if (Objects.equals(wmsInTask.getPlanTypeCode(), "GJHK")) {
// 将库位信息填充至，料箱
UcmCtBase ucmCtBase = ucmCtBaseService.selectUcmCtBaseByCode(wmsInTask.getBoxRfid());
ucmCtBase.setAttr1(wmsInTask.getCellTgt().toString());
ucmCtBaseService.updateUcmCtBase(ucmCtBase);
// 插入台账数据
wmsInPlanDetailEntityList.forEach(planDetailEntity -> { wmsInPlanDetailEntityList.forEach(planDetailEntity -> {
BaseKnife baseKnife = baseKnifeService.selectBaseKnifeByBaseKnifeId(planDetailEntity.getKnifeId()); BaseKnife baseKnife = baseKnifeService.selectBaseKnifeByBaseKnifeId(planDetailEntity.getKnifeId());
// 设置状态为 解锁 // 设置状态为 解锁