From 9591d4a4184a76f2af997a47c3bd883beecb1ea2 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 12 十二月 2025 14:56:42 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 30 +++++++++++++++++++++++-------
src/main/java/com/zy/asrs/entity/TaskDetl.java | 11 +++++++++++
src/main/webapp/static/js/common.js | 1 +
src/main/webapp/static/js/orderPakin/order.js | 1 +
4 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TaskDetl.java b/src/main/java/com/zy/asrs/entity/TaskDetl.java
index 745b03b..f683c1f 100644
--- a/src/main/java/com/zy/asrs/entity/TaskDetl.java
+++ b/src/main/java/com/zy/asrs/entity/TaskDetl.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.zy.asrs.service.MatService;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import com.core.common.SpringUtils;
@@ -477,6 +479,15 @@
return null;
}
+ public String getTag$() {
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat order = service.selectOne(new EntityWrapper<Mat>().eq("matnr", this.matnr));
+ if (Cools.isEmpty(order)){
+ return null;
+ }
+ return order.getTagId$();
+ }
+
public String getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
return "";
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 1eca080..93237b3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -656,6 +656,7 @@
waitPakin.setAnfme(detlDto.getAnfme());
waitPakin.setThreeCode(detlDto.getThreeCode());
waitPakin.setStatus("Y");
+ waitPakin.setSuppCode(detlDto.getStandby1());
waitPakin.setStandby1(detlDto.getStandby1());
waitPakin.setStandby2(detlDto.getStandby2());
waitPakin.setStandby3(detlDto.getStandby3());
@@ -1694,7 +1695,8 @@
throw new CoolException("鏄庣粏鍐呭涓嶅瓨鍦紒锛�");
}
- Double v = stationDetl.getAnfme() - stationDetl.getWorkQty();
+ Double v = Math.round((stationDetl.getAnfme() - stationDetl.getWorkQty()) * 10000) / 10000.0;
+
if (detlDto.getAnfme().compareTo(v) > 0) {
throw new CoolException("缁勬墭涓婇檺涓猴細" + stationDetl.getAnfme() + ", 宸茬粍鎵橈細" + stationDetl.getWorkQty() + ", 杩樺彲缁勬墭锛�" + v);
}
@@ -1725,7 +1727,7 @@
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
- Double v1 = stationDetl.getWorkQty() + detlDto.getAnfme();
+ Double v1 = Math.round((stationDetl.getWorkQty() + detlDto.getAnfme()) * 10000) / 10000.0 ;
stationDetl.setWorkQty(v1);
if (!basStationDetlService.updateById(stationDetl)) {
@@ -1735,6 +1737,19 @@
if (v1.compareTo(stationDetl.getWorkQty()) >= 0) {
if (!basStationDetlService.deleteById(stationDetl)) {
throw new CoolException("鍘熷鏁版嵁绉婚櫎澶辫触锛�");
+ }
+ }
+
+ List<BasStationDetl> devNo = basStationDetlService.selectList(new EntityWrapper<BasStationDetl>().eq("dev_no", stationDetl.getDevNo()));
+ if (Objects.isNull(devNo) || devNo.isEmpty()) {
+ BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
+ .eq("loc_sts", LocStsType.LOC_STS_TYPE_F.type)
+ .eq("dev_no", stationDetl.getDevNo()));
+ if (!Objects.isNull(station)) {
+ station.setLocSts(LocStsType.LOC_STS_TYPE_D.type);
+ if (!basStationService.updateById(station)) {
+ throw new CoolException("绔欑偣鐘舵�佷慨鏀瑰け璐锛侊紒");
+ }
}
}
@@ -1777,11 +1792,11 @@
throw new CoolException("绔欑偣涓嶅瓨鍦�!!");
}
- station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
- if (!basStationService.updateById(station)) {
- throw new CoolException("绔欑偣鐘舵�佷慨鏀瑰け璐�!");
- }
- basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("dev_no", station.getDevNo()));
+// station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
+// if (!basStationService.updateById(station)) {
+// throw new CoolException("绔欑偣鐘舵�佷慨鏀瑰け璐�!");
+// }
+// basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("dev_no", station.getDevNo()));
// // 浠诲姟瀹屾垚
// task.setWrkSts(15L);
@@ -1974,6 +1989,7 @@
waitPakins.forEach(waitPakin -> {
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(waitPakin);
+ wrkDetl.setSuppCode(waitPakin.getSuppCode());
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 69a4c4b..5eaadd9 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -227,6 +227,7 @@
,{field: 'specs', align: 'center',title: '瑙勬牸', hide: false}
,{field: 'tag$', align: 'center',title: '闆朵欢绫诲瀷', hide: false}
,{field: 'threeCode', align: 'center',title: 'BS Code', hide: false}
+ ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: false}
,{field: 'length', align: 'center',title: '閲嶉噺', hide: false}
,{field: 'volume', align: 'center',title: '灏哄', hide: false}
,{field: 'frozen$', align: 'center',title: '鍐荤粨鍚�',hide: true,
diff --git a/src/main/webapp/static/js/orderPakin/order.js b/src/main/webapp/static/js/orderPakin/order.js
index 30a82f5..2d90ee6 100644
--- a/src/main/webapp/static/js/orderPakin/order.js
+++ b/src/main/webapp/static/js/orderPakin/order.js
@@ -126,6 +126,7 @@
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
,{field: 'specs', align: 'center',title: '瑙勬牸', hide: false}
,{field: 'tag$', align: 'center',title: '闆朵欢绫诲瀷', hide: false}
+ ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: false}
,{field: 'threeCode', align: 'center',title: 'BS Code', hide: false}
,{ field: 'anfme', title: '鏁伴噺', align: 'center',hide: false}
,{ field: 'workQty', title: '浣滀笟鏁伴噺', align: 'center',hide: false }
--
Gitblit v1.9.1