From 14fcf17a5a2fc87708289eb3bd8d7654191fd9df Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 23 Jul 2024 12:07:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?wms=EF=BC=8Csap=E6=94=B6=E8=B4=A7=E7=94=9F?=
=?UTF-8?q?=E4=BA=A7=E6=89=B9=E6=AC=A1=EF=BC=8C=20=E5=90=8E=E9=9D=A2?=
=?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=85=A5=E5=BA=93=E6=89=B9=E6=AC=A1?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=82=E6=98=BE=E7=A4=BA=E4=B8=8A=E9=9D=A2?=
=?UTF-8?q?=E6=88=AA=E5=8F=96=E7=9A=84=E5=80=BC=E6=88=96=E8=80=85=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E5=90=8E=E7=9A=84=E5=80=BC,=E8=BF=87=E8=B4=A6?=
=?UTF-8?q?=E7=94=A8=E5=85=A5=E5=BA=93=E6=89=B9=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/api/domain/wms/wmsReportWork.java | 11 ++++-
.../java/com/op/wms/domain/WmsProductPut.java | 11 +++++
.../impl/WmsProductPutServiceImpl.java | 46 ++++++++++++-------
3 files changed, 51 insertions(+), 17 deletions(-)
diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/wmsReportWork.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/wmsReportWork.java
index 921c8ee1..622a2c88 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/wmsReportWork.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/wmsReportWork.java
@@ -193,10 +193,19 @@ public class wmsReportWork extends BaseEntity {
private String createTimeEnd;
private String feedbackTimeStart;
private String feedbackTimeEnd;
- private String batch;
+ private String batch;//生产批次
+ private String batchSK;//RK批次
private String endReport;
private String whCode;
+ public String getBatchSK() {
+ return batchSK;
+ }
+
+ public void setBatchSK(String batchSK) {
+ this.batchSK = batchSK;
+ }
+
public String getWhCode() {
return whCode;
}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java
index 5b72dc1b..31f815e5 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java
@@ -47,6 +47,15 @@ public class WmsProductPut extends BaseEntity {
*/
@Excel(name = "仓库编码")
private String whCode;
+ private String batchSK;//生产批次
+
+ public String getBatchSK() {
+ return batchSK;
+ }
+
+ public void setBatchSK(String batchSK) {
+ this.batchSK = batchSK;
+ }
/**
* 库区编码
@@ -490,4 +499,6 @@ public class WmsProductPut extends BaseEntity {
", attr10='" + attr10 + '\'' +
'}';
}
+
+
}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
index 86e9de66..e00d5215 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
@@ -329,6 +329,15 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
@DS("#header.poolName")
public List<wmsReportWork> getReportList(wmsReportWork mesReportWork) {
List<wmsReportWork> rlist = wmsProductPutMapper.getReportList(mesReportWork);
+ for (wmsReportWork wmsReportWork:
+ rlist ) {
+ if (wmsReportWork.getBatch().length()>=23){
+ String batchsk = InterceptionRules(wmsReportWork.getBatch());
+ wmsReportWork.setBatchSK(batchsk);
+ }else {
+ wmsReportWork.setBatchSK(wmsReportWork.getBatch());
+ }
+ }
return rlist;
}
@@ -365,6 +374,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
wmsProductPutk.setBatchNumber(mesReportWork.getBatch());//
// wmsProductPutk.setSapStatus("2");//过账失败的
List<WmsProductPut> wmsProductPutList = wmsProductPutMapper.selectWmsProductPutList(wmsProductPutk);
+
if (wmsProductPutList.size() > 0) {
String id = wmsProductPutList.get(0).getId();
mesReportWork.setId(id);
@@ -393,6 +403,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
wmsReportWorkListagain.add(mesReportWork);//
// }
}
+ //已经插入且插入失败的
for (wmsReportWork mesReportWork :
wmsReportWorkList) {
WmsProductPut wmsProductPutk = new WmsProductPut();
@@ -408,6 +419,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
wmsProductPutk.setUnitOfMeasure(mesReportWork.getUnit());
wmsProductPutk.setBatchNumber(mesReportWork.getBatch());//
wmsProductPutk.setSapStatus("2");
+
List<WmsProductPut> wmsProductPutList = wmsProductPutMapper.selectWmsProductPutList(wmsProductPutk);
if (wmsProductPutList.size() > 0) {//已经插入且失败的
wmsReportWorkListTWO.add(mesReportWork);//
@@ -415,7 +427,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
}
- //先屏蔽起来
+ //第一次
for (wmsReportWork mesReportWork :
wmsReportWorkListRk) {
WmsProductPut wmsProductPutk = new WmsProductPut();
@@ -433,12 +445,12 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
wmsProductPutk.setStatus("1");
wmsProductPutk.setUnitOfMeasure(mesReportWork.getUnit());
wmsProductPutk.setBatchNumber(mesReportWork.getBatch());//
+ wmsProductPutk.setAttr4(mesReportWork.getBatchSK());
//List<WmsProductPut> wmsProductPutList= wmsProductPutMapper.selectWmsProductPutList(wmsProductPutk);
-
+// wmsProductPutk.setBatchSK(mesReportWork.getBatchSK());//入库批次
wmsProductPutk.setAttr3(formattedDate);//
wmsProductPutk.setCreateBy(SecurityUtils.getUsername());
wmsProductPutk.setCreateTime(new Date());
-
wmsProductPutk.setProductDate(mesReportWork.getProductDate());
wmsProductPutk.setId(mesReportWork.getId());
wmsProductPutk.setSapStatus("0");
@@ -492,13 +504,14 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
map.put("LGORT", mesReportWork.getWhCode());
map.put("QUANTITY", mesReportWork.getQuantityQualified());
map.put("ERFME", mesReportWork.getUnit());
- if (mesReportWork.getBatch().length()>12){
- //String batch = mesReportWork.getBatch().substring(12);
- String batch = InterceptionRules(mesReportWork.getBatch());
- map.put("BATCH", batch);
- }else {
- map.put("BATCH", mesReportWork.getBatch());
- }
+ map.put("BATCH", mesReportWork.getBatchSK());
+// if (mesReportWork.getBatch().length()>12){
+// //String batch = mesReportWork.getBatch().substring(12);
+// String batch = InterceptionRules(mesReportWork.getBatch());
+//
+// }else {
+// map.put("BATCH", mesReportWork.getBatch());
+// }
String formattedsDate = mesReportWork.getProductDate().replace("-", "");
map.put("HSDAT", formattedsDate);
mapList.add(map);
@@ -532,12 +545,13 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
map.put("LGORT", mesReportWork.getWhCode());
map.put("QUANTITY", mesReportWork.getQuantityQualified());
map.put("ERFME", mesReportWork.getUnit());
- if (mesReportWork.getBatch().length()>12){
- String batch = InterceptionRules(mesReportWork.getBatch());
- map.put("BATCH", batch);
- }else {
- map.put("BATCH", mesReportWork.getBatch());
- }
+ map.put("BATCH", mesReportWork.getBatchSK());
+// if (mesReportWork.getBatch().length()>12){
+// String batch = InterceptionRules(mesReportWork.getBatch());
+// map.put("BATCH", batch);
+// }else {
+// map.put("BATCH", mesReportWork.getBatch());
+// }
String formattedsDate = mesReportWork.getProductDate().replace("-", "");
map.put("HSDAT", formattedsDate);
mapList.add(map);
From ba364605185e31a8fa013e9db637718bb22c2bed Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 23 Jul 2024 12:52:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?wms=EF=BC=8C=E6=88=90=E5=93=81=E7=94=9F?=
=?UTF-8?q?=E4=BA=A7=E5=85=A5=E5=BA=93=E9=A1=B5=E9=9D=A2=E7=9A=84=E8=BF=87?=
=?UTF-8?q?=E8=B4=A6=E6=8C=89=E9=92=AE=E9=9A=8F=E4=B9=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/WmsProductPutServiceImpl.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
index e00d5215..bcf01c55 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
@@ -285,14 +285,15 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
map.put("LGORT", wmsProductPut3.getWhCode());
map.put("QUANTITY", wmsProductPut3.getPutQuantity());
map.put("ERFME", wmsProductPut3.getUnitOfMeasure());
+ map.put("BATCH", wmsProductPut3.getAttr4());
//map.put("BATCH", wmsProductPut3.getBatchNumber());
- if (wmsProductPut3.getBatchNumber().length()>12){
- //String batch = mesReportWork.getBatch().substring(12);
- String batch = InterceptionRules(wmsProductPut3.getBatchNumber());
- map.put("BATCH", batch);
- }else {
- map.put("BATCH", wmsProductPut3.getBatchNumber());
- }
+// if (wmsProductPut3.getBatchNumber().length()>12){
+// //String batch = mesReportWork.getBatch().substring(12);
+// String batch = InterceptionRules(wmsProductPut3.getBatchNumber());
+// map.put("BATCH", batch);
+// }else {
+// map.put("BATCH", wmsProductPut3.getBatchNumber());
+// }
map.put("HSDAT", wmsProductPut3.getProductDate());
mapList.add(map);
}