From 0927dceed8e5504ec0b5eeaa446f5423ddc74ec3 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 26 十一月 2025 13:04:05 +0800
Subject: [PATCH] 1.完善验布组托 2.修复销售订单默认勾选数据对不上
---
src/main/java/com/zy/asrs/controller/MobileController.java | 67 ++++++++++++++++-----------------
1 files changed, 33 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..93b7a21 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -21,6 +21,7 @@
import com.zy.common.web.BaseController;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
+import com.zy.third.entity.ExdMaterial;
import com.zy.third.entity.ExdvYanbu;
import com.zy.third.mapper.ExdMaterialMapper;
import lombok.extern.slf4j.Slf4j;
@@ -119,19 +120,24 @@
if (docType.getPakin() == null || docType.getPakin() != 1) {
return R.ok();
}
- if (order.getSettle() > 2) {
- return R.ok();
- }
+
List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
if (Cools.isEmpty(orderDetls)) {
return R.ok();
}
- return R.ok().add(orderDetls);
+ List<OrderDetl> orderDetls1= new ArrayList<>();
+ for (OrderDetl orderDetl : orderDetls) {
+ if(orderDetl.getAnfme()-orderDetl.getWorkQty()>0){
+ orderDetls1.add(orderDetl);
+ }
+
+ }
+ return R.ok().add(orderDetls1);
}
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
- public R comb(@RequestBody CombParam combParam) {
+ public synchronized R comb(@RequestBody CombParam combParam) {
log.info("缁勬墭鏁版嵁锛歿}", combParam.toString());
mobileService.comb(combParam, getUserId(), getUser().getEmail());
return R.ok("缁勬墭鎴愬姛");
@@ -197,7 +203,7 @@
if (wrkMast != null) {
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
// 鍘婚櫎宸插嚭搴撶‘璁ょ殑鏄庣粏
- wrkDetls.removeIf(wrkDetl -> wrkDetl.getInspect() != null && wrkDetl.getInspect() != 0);
+// wrkDetls.removeIf(wrkDetl -> wrkDetl.getInspect() != null && wrkDetl.getInspect() != 0);
return R.ok().add(Cools.add("wrkNo", wrkMast.getWrkNo()).add("ioType", wrkMast.getIoType()).add("list", wrkDetls));
}
return R.ok();
@@ -467,31 +473,11 @@
}
//绌烘墭鐩樼紦鍐插尯 灏忥細E8 澶э細E9
String rStaNo = "E8";
- if (barcode.substring(0, 1).equals("9")) {
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "autoE").eq("status", "1"));
String type = "ZONE"; //鍖哄煙
if (barcode.substring(0, 1).equals("9")) {
rStaNo = "E9";
- }
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "autoE").eq("status", "1"));
- if (config != null) {
- type = "STACK"; //宸烽亾
- if (Cools.isEmpty(config.getValue())) {
- rStaNo = rStaNo + "01";
- config.setValue("2");
- } else if (config.getValue().equals("1")) {
- rStaNo = rStaNo + "01";
- config.setValue("2");
- } else if (config.getValue().equals("2")) {
- rStaNo = rStaNo + "02";
- config.setValue("3");
- } else if (config.getValue().equals("3")) {
- rStaNo = rStaNo + "03";
- config.setValue("1");
- }
- configService.updateById(config);
- } else {
- config = configService.selectOne(new EntityWrapper<Config>().eq("code", "autoE").eq("status", "1"));
-
+ }else {
if (config != null) {
type = "STACK"; //宸烽亾
if (Cools.isEmpty(config.getValue())) {
@@ -575,10 +561,8 @@
if (bool) {
return R.ok();
} else {
- return R.error();
+ return R.error(msg);
}
- }
- return R.error();
}
/**
@@ -879,7 +863,10 @@
} else if (sourceStaNo.equals("R02")) {
rcsParam.put("carrierDir", "90");
- } else {
+ } else if(sourceStaNo.substring(0,1).equals("C")){
+ rcsParam.put("carrierDir", "90");
+ }
+ else{
rcsParam.put("carrierDir", "180");
}
@@ -950,13 +937,18 @@
}
R r = R.ok();
+ //闃叉鏈夋湭涓嬫灦鐨勭墿鏂欑洿鎺ヨ繘琛岀┖鏉垮洖搴撴垨鑰呮嫞鏂欏洖搴�
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", staNo).in("wrk_sts", 33));
+ if (!Cools.isEmpty(wrkMast1)) {
+ return R.error("璇ユ墭鐩�="+wrkMast1.getBarcode()+",娌℃湁涓嬫灦锛岃涓嬫灦鍚庡啀鍥炲簱锛侊紒锛�");
+ }
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", staNo).in("io_type", 103, 105, 107));
if (wrkMast == null) {
r = FillEmptyPalletsStack(sourceStaNo, staNo);
} else {
- if (wrkMast.getWrkSts() > 30) {
- return R.error("璇ユ墭鐩�={},娌℃湁涓嬫灦锛岃涓嬫灦鍚庡啀鍥炲簱锛侊紒锛�");
+ if (wrkMast.getWrkSts() > 30&& 34< wrkMast.getWrkSts()) {
+ return R.error("璇ユ墭鐩�="+wrkMast.getBarcode()+",娌℃湁涓嬫灦锛岃涓嬫灦鍚庡啀鍥炲簱锛侊紒锛�");
}
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).in("io_type", 101, 103, 105, 107).lt("wrk_sts", 33));
if (!Cools.isEmpty(wrkMasts)) {
@@ -1006,8 +998,15 @@
return R.error("鎵规瀵瑰簲鐨勯獙甯冩暟鎹笉瀛樺湪");
}
Mat mat = matService.selectByMatnr(barcode1.getItemnumber());
+ if(Cools.isEmpty(mat.getUuid())) {
+ ExdMaterial fnumber = exdMaterialMapper.getID(barcode1.getItemnumber());
+ mat.setUuid(fnumber.getId());
+ }
mat.setAnfme(barcode1.getQty());
mat.setBc(barcode);
+ mat.setBatch(barcode);
+ matService.updateById(mat);
+
return R.ok(mat);
}
--
Gitblit v1.9.1