diff --git a/README.md b/README.md index fec1bd0..de56055 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,10 @@ -

工刀具库WMS

-

\ No newline at end of file +

工具库WMS

+

+ +# 项目启动 +## 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` \ No newline at end of file diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmsInTaskController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmsInTaskController.java index f50cdf6..de7336a 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmsInTaskController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmsInTaskController.java @@ -42,6 +42,7 @@ public class WmsInTaskController extends BaseController { private final IWmsInPlanDetailEntityService wmsInPlanDetailEntityService; private final IUcmCtBaseService ucmCtBaseService; private final IWmStorageLocationService wmStorageLocationService; + private final IUcmCtBaseService umcCtBaseService; /** * 查询入库任务列表 @@ -235,6 +236,11 @@ public class WmsInTaskController extends BaseController { }); mdItemService.updateMdItem(mbbBdMrlMitm); } else if (Objects.equals(wmsInTask.getPlanTypeCode(), "CGRK")) { + // 将库位信息填充至,料箱 + UcmCtBase ucmCtBase = ucmCtBaseService.selectUcmCtBaseByCode(wmsInTask.getBoxRfid()); + ucmCtBase.setAttr1(wmsInTask.getCellTgt().toString()); + ucmCtBaseService.updateUcmCtBase(ucmCtBase); + // 插入台账数据 wmsInPlanDetailEntityList.forEach(planDetailEntity -> { BaseKnife baseKnife = baseKnifeService.selectBaseKnifeByBaseKnifeId(planDetailEntity.getKnifeId()); // 设置状态为 解锁 @@ -247,6 +253,11 @@ public class WmsInTaskController extends BaseController { baseKnifeService.updateBaseKnife(baseKnife); }); } else if (Objects.equals(wmsInTask.getPlanTypeCode(), "GJHK")) { + // 将库位信息填充至,料箱 + UcmCtBase ucmCtBase = ucmCtBaseService.selectUcmCtBaseByCode(wmsInTask.getBoxRfid()); + ucmCtBase.setAttr1(wmsInTask.getCellTgt().toString()); + ucmCtBaseService.updateUcmCtBase(ucmCtBase); + // 插入台账数据 wmsInPlanDetailEntityList.forEach(planDetailEntity -> { BaseKnife baseKnife = baseKnifeService.selectBaseKnifeByBaseKnifeId(planDetailEntity.getKnifeId()); // 设置状态为 解锁