From 0d11ab9cfb4e9728b2b182cdff1155221d6c9ade Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期六, 10 一月 2026 09:10:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 138e46b..8959e59 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,7 +1,5 @@
package com.zy.common.service;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
@@ -85,8 +83,18 @@
}
public boolean completeTask(CompleteTaskParam param) {
+ WrkMast wrkMast = null;
Integer wrkNo = param.getWrkNo();
- WrkMast wrkMast = wrkMastService.selectByWorkNo(wrkNo);
+ String taskNo = param.getTaskNo();//wms浠诲姟鍙�
+
+ if(wrkNo == null) {
+ if (!Cools.isEmpty(taskNo)) {
+ wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wms_wrk_no", taskNo));
+ }
+ }else {
+ wrkMast = wrkMastService.selectByWorkNo(wrkNo);
+ }
+
if (null == wrkMast) {
throw new CoolException("浠诲姟涓嶅瓨鍦�");
}
@@ -105,8 +113,18 @@
}
public boolean cancelTask(CancelTaskParam param) {
+ WrkMast wrkMast = null;
Integer wrkNo = param.getWrkNo();
- WrkMast wrkMast = wrkMastService.selectByWorkNo(wrkNo);
+ String taskNo = param.getTaskNo();//wms浠诲姟鍙�
+
+ if(wrkNo == null) {
+ if (!Cools.isEmpty(taskNo)) {
+ wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wms_wrk_no", taskNo));
+ }
+ }else {
+ wrkMast = wrkMastService.selectByWorkNo(wrkNo);
+ }
+
if (null == wrkMast) {
throw new CoolException("浠诲姟涓嶅瓨鍦�");
}
@@ -156,7 +174,6 @@
if (!sourceCrnResult.getCrnNo().equals(targetCrnResult.getCrnNo())) {
throw new CoolException("婧愬簱浣嶅拰鐩爣搴撲綅涓嶅湪鍚屼竴宸烽亾");
}
- Integer crnNo = targetCrnResult.getCrnNo();
// 鑾峰彇宸ヤ綔鍙�
int workNo = getWorkNo(WrkIoType.LOC_MOVE.id);
@@ -169,11 +186,19 @@
wrkMast.setIoPri(ioPri);
wrkMast.setSourceLocNo(param.getSourceLocNo());
wrkMast.setLocNo(param.getLocNo()); // 鐩爣搴撲綅
- wrkMast.setCrnNo(crnNo);
wrkMast.setWmsWrkNo(param.getTaskNo());
wrkMast.setBarcode(sourceLocMast.getBarcode());
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
+
+ if (targetCrnResult.getCrnType().equals(SlaveType.Crn)) {
+ wrkMast.setCrnNo(targetCrnResult.getCrnNo());
+ } else if (targetCrnResult.getCrnType().equals(SlaveType.DualCrn)) {
+ wrkMast.setDualCrnNo(targetCrnResult.getCrnNo());
+ }else {
+ throw new CoolException("鏈煡璁惧绫诲瀷");
+ }
+
boolean res = wrkMastService.insert(wrkMast);
if (!res) {
News.error("绉诲簱浠诲姟 --- 淇濆瓨宸ヤ綔妗ｅけ璐ワ紒");
--
Gitblit v1.9.1