From bcd046ee24ce63d23827f724697457012cf7ca81 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 15 十月 2025 10:27:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/third/entity/ExdInstockTarget.java | 2
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 74 ++++++++++++++++++------------------
src/main/resources/mapper/third/ExdInstockTargetMapper.xml | 1
src/main/resources/mapper/third/ExdMaterialMapper.xml | 12 +++---
src/main/resources/application.yml | 12 +++---
5 files changed, 51 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 61a3c32..59d3db1 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -446,44 +446,44 @@
int i = -1;
for (WrkDetl wrkDetl : wrkDetls) {
if (Cools.isEmpty(wrkDetl.getOrderNo()) && !Cools.isEmpty(wrkDetl.getInspect()) && wrkDetl.getInspect() == 1) {
- continue;
+ ExdvYanbu bacode = exdMaterialMapper.getBacode(wrkDetl.getThreeCode());
+ if (bacode == null) {
+ log.info("楠屽竷鏁版嵁娌℃湁锛寋}", wrkDetl.getThreeCode());
+ return;
+ }
+ exdInstockTarge = new ExdInstockTarget();
+ exdInstockTarge.setFtrantype(21);
+ exdInstockTarge.setFdate(new Date());
+ exdInstockTarge.setFrob(1);
+
+ exdInstockTarge.setFqty(wrkDetl.getAnfme());
+ exdInstockTarge.setFbatchno(bacode.getBatchno());
+ exdInstockTarge.setFsourcebillno(bacode.getIcmono());
+ exdInstockTarge.setFsourcetrantype(85);
+
+ exdInstockTarge.setFentryid(i);
+ exdInstockTarge.setFsmanagerid(Integer.valueOf(wrkDetl.getColor()));
+ exdInstockTarge.setFfmanagerid(Integer.valueOf(wrkDetl.getColor()));
+ exdInstockTarge.setFbillerid(Integer.valueOf(wrkDetl.getColor()));
+ exdInstockTarge.setFitemid(Integer.parseInt(wrkDetl.getSku()));
+
+ exdInstockTarge.setFsourceentryid(i);
+ //exdInstockTarge.setFdcspid(wrkMast.getLocNo());
+ //exdInstockTarge.setFdcstockid(wrkDetl.getBrand());
+
+ exdInstockTarge.setBarcode(wrkDetl.getBatch());
+ exdInstockTarge.setGross(bacode.getGross());
+ exdInstockTarge.setWidth(bacode.getWidth());
+ exdInstockTarge.setDefects(bacode.getDefects());
+ exdInstockTarge.setBackcode(bacode.getBackcode());
+ exdInstockTarge.setWritetime(new Date());
+ exdInstockTarge.setWritor("WMS");
+ exdInstockTarge.setStatus(0);
+ exdInstockTarge.setProdinkind("鎴愬搧搴�");
+ //exdInstockTarge.setProdInKind("鐗归噰搴�");
+ exdInstockTargetService.insert(exdInstockTarge);
+ i++;
}
- ExdvYanbu bacode = exdMaterialMapper.getBacode(wrkDetl.getBatch());
- if (bacode == null) {
- return;
- }
- exdInstockTarge = new ExdInstockTarget();
- exdInstockTarge.setFtrantype(21);
- exdInstockTarge.setFdate(new Date());
- exdInstockTarge.setFrob(1);
-
- exdInstockTarge.setFqty(wrkDetl.getAnfme());
- exdInstockTarge.setFbatchno(bacode.getBatchno());
- exdInstockTarge.setFsourcebillno(bacode.getIcmono());
- exdInstockTarge.setFsourcetrantype(85);
-
- exdInstockTarge.setFentryid(i);
- exdInstockTarge.setFsmanagerid(Integer.valueOf(wrkDetl.getColor()));
- exdInstockTarge.setFfmanagerid(Integer.valueOf(wrkDetl.getColor()));
- exdInstockTarge.setFbillerid(Integer.valueOf(wrkDetl.getColor()));
- exdInstockTarge.setFitemid(Integer.parseInt(wrkDetl.getSku()));
-
- exdInstockTarge.setFsourceentryid(i);
- //exdInstockTarge.setFdcspid(wrkMast.getLocNo());
- //exdInstockTarge.setFdcstockid(wrkDetl.getBrand());
-
- exdInstockTarge.setBarcode(wrkDetl.getBatch());
- exdInstockTarge.setGross(bacode.getGross());
- exdInstockTarge.setWidth(bacode.getWidth());
- exdInstockTarge.setDefects(bacode.getDefects());
- exdInstockTarge.setBackcode(bacode.getBackcode());
- exdInstockTarge.setWritetime(new Date());
- exdInstockTarge.setWritor("WMS");
- exdInstockTarge.setStatus(0);
- exdInstockTarge.setProdInKind("鎴愬搧搴�");
- //exdInstockTarge.setProdInKind("鐗归噰搴�");
- exdInstockTargetService.insert(exdInstockTarge);
- i++;
}
}
diff --git a/src/main/java/com/zy/third/entity/ExdInstockTarget.java b/src/main/java/com/zy/third/entity/ExdInstockTarget.java
index 17dbd34..53f6f8e 100644
--- a/src/main/java/com/zy/third/entity/ExdInstockTarget.java
+++ b/src/main/java/com/zy/third/entity/ExdInstockTarget.java
@@ -222,7 +222,7 @@
/**
*
*/
- private String ProdInKind;
+ private String prodinkind;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a47ff64..e0deb17 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -33,12 +33,12 @@
# password: root
#driver-class-name: com.mysql.cj.jdbc.Driver
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# jdbc-url: jdbc:sqlserver://192.168.3.148:1433;databasename=wms_middle
-# username: wms
-# password: wms@aunde
- jdbc-url: jdbc:sqlserver://127.0.0.1:1433;databasename=wms_middle
- username: sa
- password: sa@123
+ jdbc-url: jdbc:sqlserver://192.168.3.148:1433;databasename=wms_middle
+ username: wms
+ password: wms@aunde
+# jdbc-url: jdbc:sqlserver://127.0.0.1:1433;databasename=wms_middle
+# username: sa
+# password: sa@123
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
diff --git a/src/main/resources/mapper/third/ExdInstockTargetMapper.xml b/src/main/resources/mapper/third/ExdInstockTargetMapper.xml
index 8445198..ff7595f 100644
--- a/src/main/resources/mapper/third/ExdInstockTargetMapper.xml
+++ b/src/main/resources/mapper/third/ExdInstockTargetMapper.xml
@@ -45,6 +45,7 @@
<result property="reador" column="Reador" />
<result property="writormsg" column="WritorMsg" />
<result property="readormsg" column="ReadorMsg" />
+ <result property="prodinkind" column="ProdInKind" />
</resultMap>
<sql id="Base_Column_List">
diff --git a/src/main/resources/mapper/third/ExdMaterialMapper.xml b/src/main/resources/mapper/third/ExdMaterialMapper.xml
index fb92aca..183a266 100644
--- a/src/main/resources/mapper/third/ExdMaterialMapper.xml
+++ b/src/main/resources/mapper/third/ExdMaterialMapper.xml
@@ -30,13 +30,13 @@
</select>
<select id="getBacode" resultType="com.zy.third.entity.ExdvYanbu" parameterType="string">
- <!-- SELECT top 1 *
+ SELECT top 1 *
FROM [Textile].[trade].[TianfuQcResult]
- where Barcode = #{barcode} -->
- SELECT top 1 *
- FROM TianfuQcResult
where Barcode = #{barcode}
+ <!-- SELECT top 1 *
+ FROM TianfuQcResult
+ where Barcode = #{barcode}-->
- </select>
+ </select>
-</mapper>
+ </mapper>
--
Gitblit v1.9.1