From f253d12153bf21f25421761411c8a347d6f0b46f Mon Sep 17 00:00:00 2001 From: Kelvin Date: Thu, 19 Dec 2024 09:48:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E8=AF=B4=E6=98=8E=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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 From a8bf938f30ea4a0326c8eca314fab11689bd791f Mon Sep 17 00:00:00 2001 From: Kelvin Date: Thu, 19 Dec 2024 09:49:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E6=89=A7=E8=A1=8C=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=90=8E=E5=B0=86=E5=BA=93=E4=BD=8D=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=A1=AB=E5=85=85=EF=BC=8C=E6=96=99=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ktg/mes/wm/controller/WmsInTaskController.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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()); // 设置状态为 解锁