From 8050285fdb292d324d36b44f112b287214a0a573 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 13 十月 2025 16:47:07 +0800
Subject: [PATCH] 对接
---
src/main/resources/mapper/third/ExdMaterialMapper.xml | 14 +++---
src/main/java/com/zy/asrs/entity/Mat.java | 3 +
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 46 ++++++++++++++---------
src/main/java/com/zy/asrs/controller/MobileController.java | 1
src/main/resources/application.yml | 12 +++---
src/main/resources/mapper/asrs/OrderDetlMapper.xml | 6 +-
6 files changed, 48 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 1a0a1f5..5eff674 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -1008,6 +1008,7 @@
Mat mat = matService.selectByMatnr(barcode1.getItemnumber());
mat.setAnfme(barcode1.getQty());
mat.setBc(barcode);
+ mat.setBatch(barcode1.getBatchno());
return R.ok(mat);
}
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 1f1aa2c..32a64cb 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -31,6 +31,9 @@
@TableField(exist = false)
+ private String batch;
+
+ @TableField(exist = false)
private String bc;
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 1f5f169..63f518a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -81,6 +81,9 @@
@Override
@Transactional
public void comb(CombParam param, Long userId, String fxId) {
+ if (Cools.isEmpty(fxId)){
+ throw new CoolException("璇风敤鑷繁鐨勮处鍙风粍鎵�");
+ }
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
@@ -89,6 +92,7 @@
eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
throw new CoolException(param.getBarcode() + "鏁版嵁缁勬墭妗ｄ腑宸插瓨鍦�");
}
+
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
@@ -105,26 +109,26 @@
Date now = new Date();
//杩涜鎵瑰彿绛涢�夛紝鎵瑰彿鍙兘鍞竴
- Set<String> batchs = new HashSet<>();
- List<String> strings = new ArrayList<>();
+// Set<String> batchs = new HashSet<>();
+// List<String> strings = new ArrayList<>();
- for (CombParam.CombMat mat : param.getCombMats()) {
- if (Cools.isEmpty(mat.getBatch())) {
- continue;
- }
- batchs.add(mat.getBatch());
- strings.add(mat.getBatch());
- WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("batch", mat.getBatch()));
- WrkDetl batch = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", mat.getBatch()));
- LocDetl batch1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", mat.getBatch()));
- if (!Cools.isEmpty(batch) || !Cools.isEmpty(batch1) || !Cools.isEmpty(waitPakin)) {
- throw new CoolException("璇ョ墿鏂欐壒鍙�" + mat.getBatch() + "宸插湪鍏ュ簱閫氱煡妗ｃ�佷换鍔℃槑缁嗗拰搴撳瓨涓瓨鍦�");
- }
- }
- if (batchs.size() < strings.size()) {
- throw new CoolException("鏈夐噸澶嶇殑鐗╂枡鎵瑰彿");
- }
+// for (CombParam.CombMat mat : param.getCombMats()) {
+// if (Cools.isEmpty(mat.getBatch())) {
+// continue;
+// }
+// batchs.add(mat.getBatch());
+// strings.add(mat.getBatch());
+// WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("batch", mat.getBatch()));
+// WrkDetl batch = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", mat.getBatch()));
+// LocDetl batch1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", mat.getBatch()));
+// if (!Cools.isEmpty(batch) || !Cools.isEmpty(batch1) || !Cools.isEmpty(waitPakin)) {
+// throw new CoolException("璇ョ墿鏂欐壒鍙�" + mat.getBatch() + "宸插湪鍏ュ簱閫氱煡妗ｃ�佷换鍔℃槑缁嗗拰搴撳瓨涓瓨鍦�");
+// }
+// }
+// if (batchs.size() < strings.size()) {
+// throw new CoolException("鏈夐噸澶嶇殑鐗╂枡鎵瑰彿");
+// }
int i = 1;
// 鏃犲崟缁勬墭
if (Cools.isEmpty(param.getOrderNo())) {
@@ -132,6 +136,12 @@
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
+ // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+ eq("three_code", elem.getBc())) > 0) {
+ throw new CoolException( elem.getBc() + "鏁版嵁缁勬墭妗ｄ腑宸插瓨鍦�");
+ }
+
DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
detlDto.setBc(elem.getBc());
if (DetlDto.has(detlDtos, detlDto)) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9b39719..a47ff64 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=ycawdasrs
-# 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/asrs/OrderDetlMapper.xml b/src/main/resources/mapper/asrs/OrderDetlMapper.xml
index fe3f6a5..e2b9d92 100644
--- a/src/main/resources/mapper/asrs/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/asrs/OrderDetlMapper.xml
@@ -203,12 +203,12 @@
<update id="increaseWorkQty2">
update man_order_detl
set work_qty = work_qty + #{workQty}
+ <if test="color!=null and color!='' ">
+ , color = #{color}
+ </if>
where 1=1
and order_id = #{orderId}
and matnr = #{matnr}
- <if test="color!=null and color!='' ">
- and color = #{color}
- </if>
<choose>
<when test="batch != null and batch != ''">
and batch = #{batch}
diff --git a/src/main/resources/mapper/third/ExdMaterialMapper.xml b/src/main/resources/mapper/third/ExdMaterialMapper.xml
index a3cff33..fb92aca 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 *
- FROM [Textile].[trade].[TianfuQcResult]
- where Barcode = #{barcode}
- <!-- SELECT top 1 *
- FROM ExdV_Yanbu
- where Barcode = #{barcode}
- -->
+ <!-- SELECT top 1 *
+ FROM [Textile].[trade].[TianfuQcResult]
+ where Barcode = #{barcode} -->
+ SELECT top 1 *
+ FROM TianfuQcResult
+ where Barcode = #{barcode}
+
</select>
</mapper>
--
Gitblit v1.9.1