From 5d7ce363bad851134f3f3f644fe03fb5ec61ab6e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 11 七月 2022 09:28:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 deletions(-)
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 4f9e757..ec8c777 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -1,9 +1,11 @@
package com.zy.asrs.task.handler;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
-import com.zy.asrs.entity.*;
+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.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -36,11 +38,11 @@
private WaitPakinService waitPakinService;
public ReturnT<String> start(WrkMast wrkMast) {
- // 4.鍏ュ簱瀹屾垚
- if (wrkMast.getWrkSts() == 4) {
+ // 9.鍏ュ簱瀹屾垚
+ if (wrkMast.getWrkSts() == 9) {
return doIn(wrkMast);
- // 14.鍑哄簱瀹屾垚
- } else if (wrkMast.getWrkSts() == 14) {
+ // 17.鍑哄簱瀹屾垚
+ } else if (wrkMast.getWrkSts() == 17) {
return doOut(wrkMast);
}
return SUCCESS;
@@ -59,6 +61,9 @@
case 10:
// 淇敼搴撲綅鐘舵��=D
if (locMast.getLocSts().equals("S") || locMast.getLocSts().equals("Q")) {
+ if (!Cools.isEmpty(wrkMast.getBarcode())) {
+ locMast.setBarcode(wrkMast.getBarcode());
+ }
locMast.setLocSts("D");
locMast.setIoTime(now);
locMast.setModiTime(now);
@@ -102,19 +107,19 @@
// 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
try {
- Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
- .eq("zpallet", wrkDetl.getZpallet())
- .eq("matnr", wrkDetl.getMatnr())
- .eq("anfme", wrkDetl.getAnfme());
- if (Cools.isEmpty(wrkDetl.getBatch())) {
- wrapper.eq("batch", wrkDetl.getBatch());
- } else {
- wrapper.isNull("batch").or().eq("batch", "");
- }
- WaitPakin setParam = new WaitPakin();
- setParam.setIoStatus("Y");
- setParam.setModiTime(now);
- waitPakinService.update(setParam, wrapper);
+// Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
+// .eq("zpallet", wrkDetl.getZpallet())
+// .eq("matnr", wrkDetl.getMatnr())
+// .eq("anfme", wrkDetl.getAnfme());
+// if (Cools.isEmpty(wrkDetl.getBatch())) {
+// wrapper.eq("batch", wrkDetl.getBatch());
+// } else {
+// wrapper.isNull("batch").or().eq("batch", "");
+// }
+// WaitPakin setParam = new WaitPakin();
+// setParam.setIoStatus("Y");
+// setParam.setModiTime(now);
+// waitPakinService.update(setParam, wrapper);
} catch (Exception ignore){}
}
@@ -274,6 +279,10 @@
switch (wrkMast.getIoType()) {
// 鍏ㄦ澘鍑哄簱
case 101:
+ // 鍑哄簱纭淇″彿浣�
+ if (Cools.isEmpty(wrkMast.getInvWh()) || wrkMast.getInvWh().equals("N")) {
+ return SUCCESS;
+ }
// 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
List<WrkDetl> wrkDetls101 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
if (wrkDetls101.isEmpty()) {
--
Gitblit v1.9.1