From 16fe9b24bb2db438cbfa2a32c4d698f9e1cdfdd5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 06 七月 2020 09:07:31 +0800
Subject: [PATCH] #任务中心————全板入库
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 65 ++++++++++++++++++++------------
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 1
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2
3 files changed, 42 insertions(+), 26 deletions(-)
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 3760b18..5f5b2b2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -51,7 +51,7 @@
combMat.getCount(), // 鏁伴噺
matCode.getStr1(), // 鍗曚綅
"N", // 鐘舵��
- "", // 澶囨敞
+ null, // 澶囨敞
new Date(), // 淇敼鏃堕棿
userId, // 淇敼浜哄憳
new Date(), // 娣诲姞鏃堕棿
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index aab1e09..4e8fe30 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -73,6 +73,7 @@
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
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 2d0591b..d8c8628 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -1,14 +1,8 @@
package com.zy.asrs.task.handler;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.LocDetlService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.WrkDetlService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -32,6 +26,8 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private WaitPakinService waitPakinService;
public void start() {
List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
@@ -51,11 +47,14 @@
private void doIn(WrkMast wrkMast){
Date now = new Date();
+ LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ if (null == locMast) {
+ exceptionHandle(""); // todo
+ }
switch (wrkMast.getIoType()) {
// 绌烘澘鍏ュ簱
case 10:
// 淇敼搴撲綅鐘舵��=D
- LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
if (null != locMast && (locMast.getLocType().equals("S") || locMast.getLocType().equals("Q"))) {
locMast.setLocType("D");
locMast.setIoTime(now);
@@ -65,8 +64,9 @@
}
}
break;
+ // 鍏ㄦ澘鍏ュ簱
case 1:
-
+ // 娓呴櫎鎵�灞炲簱浣嶄箣鍓嶇殑搴撳瓨鏄庣粏
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()));
if (!locDetls.isEmpty()) {
locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()));
@@ -76,9 +76,8 @@
if (wrkDetls.isEmpty()) {
exceptionHandle(""); // todo
}
-
+ // 閬嶅巻宸ヤ綔鏄庣粏锛屾洿鏂板簱瀛樻槑缁嗗拰鍏ュ簱閫氱煡妗�
for (WrkDetl wrkDetl : wrkDetls) {
-
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()).eq("matnr", wrkDetl.getMatnr()));
if (null != locDetl) {
locDetl.setAnfme(wrkDetl.getAnfme());
@@ -94,27 +93,43 @@
null, // 杞偍璇锋眰缂栧彿
null, // 琛岄」鐩�
null, // 鐗╂枡鏍囩ID
- null, // 鐗╂枡鎻忚堪
+ wrkDetl.getMaktx(), // 鐗╂枡鎻忚堪
null, // 宸ュ巶
- null, // 鏁伴噺
- null, // 鍗曚綅
- null, // 鎵樼洏鏉＄爜
+ wrkDetl.getAnfme(), // 鏁伴噺
+ wrkDetl.getAltme(), // 鍗曚綅
+ wrkDetl.getZpallet(), // 鎵樼洏鏉＄爜
null, // 鐢ㄦ埛ID
null, // 澶囨敞
null, // 淇敼浜哄憳
- null, // 淇敼鏃堕棿
+ now, // 淇敼鏃堕棿
null, // 鍒涘缓鑰�
- null // 娣诲姞鏃堕棿
+ now // 娣诲姞鏃堕棿
);
- // todo
-
+ if (!locDetlService.insert(locDetl)) {
+ exceptionHandle(""); // todo
+ }
}
-
-
+ // 鏇存柊鍏ュ簱閫氱煡妗� status ===>> Y
+ WaitPakin setParam = new WaitPakin();
+ setParam.setStatus("Y");
+ boolean updateRes = waitPakinService.update(setParam
+ , new EntityWrapper<WaitPakin>().eq("barcode", wrkDetl.getZpallet())
+ .eq("matnr", wrkDetl.getMatnr())
+ .eq("anfme", wrkDetl.getAnfme()));
+ if (!updateRes) {
+ exceptionHandle(""); // todo
+ }
}
-
-
-
+ // 淇敼搴撲綅鐘舵�� S ====>> F
+ if (locMast.getLocType().equals("S")) {
+ locMast.setLocType("F");
+ locMast.setBarcode(wrkMast.getBarcode());
+ locMast.setIoTime(now);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ exceptionHandle(""); // todo
+ }
+ }
break;
case 53:
break;
--
Gitblit v1.9.1