From 8570b32ed879dbe625b58d31c6ed04288cd9d476 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 16 十二月 2025 08:24:56 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/webapp/static/js/locDetl/locDetl.js | 3 +
src/main/webapp/views/wrkMast/wrkMast.html | 3 +
src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java | 5 ++
src/main/java/com/zy/asrs/entity/LocDetl.java | 6 +++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 85 ++++++++++++++++++++++--------------------
src/main/java/com/zy/asrs/entity/result/CrnTaskDetlDTO.java | 18 +++++++++
6 files changed, 77 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 89ae35e..43bf291 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -256,6 +256,12 @@
LocMast locMast = service.selectById(this.locNo);
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
+ }else {
+ LocCacheService service2 = SpringUtils.getBean(LocCacheService.class);
+ LocCache locCache = service2.selectOne(new EntityWrapper<LocCache>().eq("loc_no", this.locNo));
+ if (!Cools.isEmpty(locCache)){
+ return String.valueOf(locCache.getLocNo());
+ }
}
return null;
}
diff --git a/src/main/java/com/zy/asrs/entity/result/CrnTaskDetlDTO.java b/src/main/java/com/zy/asrs/entity/result/CrnTaskDetlDTO.java
new file mode 100644
index 0000000..9f92471
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/result/CrnTaskDetlDTO.java
@@ -0,0 +1,18 @@
+package com.zy.asrs.entity.result;
+
+import com.zy.asrs.entity.LocDetl;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class CrnTaskDetlDTO {
+
+ private String locNo;
+
+ private List<LocDetl> locDetlList;
+
+}
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 a308e60..2eb3bf8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -8,10 +8,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
-import com.zy.asrs.entity.result.FindLocNoAttributeVo;
-import com.zy.asrs.entity.result.ForwardAGVTaskDTO;
-import com.zy.asrs.entity.result.HIKApiDTO;
-import com.zy.asrs.entity.result.HIKResultDTO;
+import com.zy.asrs.entity.result.*;
import com.zy.asrs.enums.*;
import com.zy.asrs.enums.LocAreaType;
import com.zy.asrs.enums.LocStsType;
@@ -2118,7 +2115,7 @@
}
Collections.shuffle(devps);
BasDevp basDevp = devps.stream().findFirst().get();
- List<LocMast> locMasts = new ArrayList<>();
+ List<CrnTaskDetlDTO> locMasts = new ArrayList<>();
Map<String, List<LocDetl>> listMap = locDetls.stream().collect(Collectors.groupingBy(LocDetl::getMatnr));
//鑾峰彇鏌ュ簱瀛樻�绘暟閲�
AtomicReference<Double> totalOut = new AtomicReference<>(0.0);
@@ -2162,7 +2159,8 @@
if (sum.compareTo(v) <= 0 && sum.compareTo(itemed.get()) > 0) {
itemed.set(Math.round((itemed.get() + v) * 10000) / 10000.0);
// 鍙斁涓�
- locMasts.add(locMast);
+ CrnTaskDetlDTO crnTaskDetlDTO = new CrnTaskDetlDTO().setLocNo(locMast.getLocNo()).setLocDetlList(adetls);
+ locMasts.add(crnTaskDetlDTO);
totalOut.set(Math.round((totalOut.get() + itemed.get()) * 10000) / 10000.0);
}
}
@@ -2181,9 +2179,10 @@
.eq("loc_sts", LocStsType.LOC_STS_TYPE_D.type)
.orderAsc(Arrays.asList("row1", "bay1", "lev1"))
.last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));
- locMasts.add(locMast);
+ CrnTaskDetlDTO crnTaskDetlDTO = new CrnTaskDetlDTO().setLocNo(locMast.getLocNo()).setLocDetlList(locDetls);
+ locMasts.add(crnTaskDetlDTO);
// 绌烘澘鍑哄簱
- generateTask(locMasts, TaskIOType.EMPTY_OUT.type, basDevp, userId);
+ generateTask(locMasts, TaskIOType.MERGE_OUT.type, basDevp, userId);
}
}
@@ -2195,47 +2194,51 @@
* @date 2025/12/6 14:44
*/
@Transactional(rollbackFor = Exception.class)
- public void generateTask(List<LocMast> locMasts, Integer ioType, BasDevp devp, Long userId) {
+ public void generateTask(List<CrnTaskDetlDTO> locMasts, Integer ioType, BasDevp devp, Long userId) {
Date now = new Date();
- for (LocMast locMast : locMasts) {
+
+ for (CrnTaskDetlDTO crnTaskDetlDTO : locMasts) {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", crnTaskDetlDTO.getLocNo()));
if (Objects.isNull(ioType)) {
continue;
}
- Integer outSta = devp.getDevNo();
- // 鑾峰彇璺緞
- StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", locMast.getLocNo()));
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
- // 鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(now);
- wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
- wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶被鍨�
- wrkMast.setIoPri(13D); // 浼樺厛绾э細13
- wrkMast.setCrnNo(locMast.getCrnNo());
- wrkMast.setSourceStaNo(staDesc.getCrnStn() + ""); // 婧愮珯
- wrkMast.setStaNo(staDesc.getStnNo() + ""); // 鐩爣绔�
- wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setLinkMis("N");
- wrkMast.setBarcode(locMast.getBarcode());
- wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast.setAppeTime(now);
- wrkMast.setModiUser(userId);
- wrkMast.setModiTime(now);
- if (!wrkMastService.insert(wrkMast)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + locMast.getLocNo());
+ if (Cools.isEmpty(wrkMast1)){
+ Integer outSta = devp.getDevNo();
+ // 鑾峰彇璺緞
+ StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
+
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶被鍨�
+ wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setCrnNo(locMast.getCrnNo());
+ wrkMast.setSourceStaNo(staDesc.getCrnStn() + ""); // 婧愮珯
+ wrkMast.setStaNo(staDesc.getStnNo() + ""); // 鐩爣绔�
+ wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("N");
+ wrkMast.setBarcode(locMast.getBarcode());
+ wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + locMast.getLocNo());
+ }
+ }else {
+ workNo = wrkMast1.getWrkNo();
}
-
- List<LocDetl> locDetls = locDetlService
- .selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
-
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
- for (LocDetl detlDto : locDetls) {
+ for (LocDetl detlDto : crnTaskDetlDTO.getLocDetlList()) {
WrkDetl wrkDetl = new WrkDetl();
BeanUtils.copyProperties(detlDto, wrkDetl);
wrkDetl.setOrderNo(""); // 鎵嬪姩鍑哄簱涓嶉渶瑕佸甫鍑哄簱瀛樹腑鐨勫崟鎹紪鍙�
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
index 8e0b61d..b164ac9 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
@@ -245,6 +245,9 @@
if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103) {
List<TaskDetl> wrkDetls = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("wrk_no", wrkMast.getWrkNo()));
for (TaskDetl wrkDetl : wrkDetls) {
+ if (Cools.isEmpty(wrkDetl.getOrderNo())){
+ continue;
+ }
if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
OrderInAndOutUtil.decrease(Boolean.FALSE, wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(),
wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
@@ -254,7 +257,7 @@
boolean flag = true;
OrderPakin order = orderService.selectByNo(wrkDetl.getOrderNo()); //OrderInAndOutUtil.selectByNo(Boolean.FALSE, wrkDetl.getOrderNo());
if (Objects.isNull(order)) {
- throw new CoolException("鍗曟嵁淇℃伅涓嶅瓨鍦紒锛�");
+ continue;
}
List<OrderDetlPakin> orderDetls = orderDetlService.selectByOrderId(order.getId()); //OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
for (OrderDetlPakin orderDetl : orderDetls) {
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 531ae9b..15c2cef 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -7,7 +7,8 @@
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
+ ,{field: 'threeCode', align: 'center',title: 'BS Code', sort:true}
+ ,{field: 'standby1', align: 'center',title: '渚涘簲鍟嗕唬鐮�', sort:true}
,{field: 'anfme', align: 'center',title: '鍙敤鏁伴噺'}
,{field: 'diffQty', align: 'center',title: '宸紓鏁伴噺',
templet: function(d) {
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 6fc48be..5e1d6cd 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -129,6 +129,9 @@
{{#if (d.ioType === 107) { }}
<a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">鐩�</a>
{{# } }}
+ {{#if (d.ioType === 104) { }}
+ <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">骞�</a>
+ {{# } }}
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
--
Gitblit v1.9.1