From 8dc960dd9fda130ff19faaafed6b1234e622610b Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期五, 19 十二月 2025 15:23:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index fbfa65e..85cdae0 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,6 +1,7 @@
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;
@@ -37,8 +38,6 @@
private BasCrnpService basCrnpService;
@Autowired
private NavigateUtils navigateUtils;
- @Autowired
- private CommonService commonService;
@Autowired
private RedisUtil redisUtil;
@@ -139,12 +138,12 @@
ioPri = param.getTaskPri().doubleValue();
}
- Integer sourceCrnNo = commonService.findCrnNoByLocNo(sourceLocMast.getLocNo());
+ Integer sourceCrnNo = this.findCrnNoByLocNo(sourceLocMast.getLocNo());
if (sourceCrnNo == null) {
throw new CoolException("鏈壘鍒板搴斿爢鍨涙満");
}
- Integer crnNo = commonService.findCrnNoByLocNo(locMast.getLocNo());
+ Integer crnNo = this.findCrnNoByLocNo(locMast.getLocNo());
if (crnNo == null) {
throw new CoolException("鏈壘鍒板搴斿爢鍨涙満");
}
@@ -166,6 +165,7 @@
wrkMast.setLocNo(param.getLocNo()); // 鐩爣搴撲綅
wrkMast.setCrnNo(crnNo);
wrkMast.setWmsWrkNo(param.getTaskNo());
+ wrkMast.setBarcode(sourceLocMast.getBarcode());
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
boolean res = wrkMastService.insert(wrkMast);
@@ -186,7 +186,7 @@
}
//鍏ュ簱浠诲姟
- public boolean createInTask(CreateInTaskParam param) {
+ public WrkMast createInTask(CreateInTaskParam param) {
Date now = new Date();
LocMast locMast = locMastService.queryByLoc(param.getLocNo());
if (null == locMast) {
@@ -202,7 +202,7 @@
ioPri = param.getTaskPri().doubleValue();
}
- Integer crnNo = commonService.findCrnNoByLocNo(locMast.getLocNo());
+ Integer crnNo = this.findCrnNoByLocNo(locMast.getLocNo());
if (crnNo == null) {
throw new CoolException("鏈壘鍒板搴斿爢鍨涙満");
}
@@ -236,7 +236,7 @@
//缂撳瓨璁板綍褰撳墠鍛戒护鍫嗗灈鏈虹紪鍙�
redisUtil.set(RedisKeyType.CURRENT_CIRCLE_TASK_CRN_NO.key, crnNo, 60 * 60 * 24);
- return true;
+ return wrkMast;
}
//鍑哄簱浠诲姟
@@ -256,14 +256,28 @@
ioPri = param.getTaskPri().doubleValue();
}
- Integer crnNo = commonService.findCrnNoByLocNo(locMast.getLocNo());
+ Integer crnNo = this.findCrnNoByLocNo(locMast.getLocNo());
if (crnNo == null) {
throw new CoolException("鏈壘鍒板搴斿爢鍨涙満");
}
- Integer sourceStationId = commonService.findOutStationId(crnNo, param.getStaNo());
+ Integer sourceStationId = this.findOutStationId(crnNo, param.getStaNo());
if (sourceStationId == null) {
throw new CoolException("鏈壘鍒拌緭閫佺洰鏍囩珯鐐瑰彲璧拌璺緞");
+ }
+
+ BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", crnNo));
+ if(basCrnp == null) {
+ throw new CoolException("鏈壘鍒板搴斿爢鍨涙満鏁版嵁");
+ }
+ List<WrkMast> outWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .eq("crn_no", crnNo)
+ .eq("io_type", WrkIoType.OUT.id)
+ );
+ // 妫�鏌ユ槸鍚﹁秴杩囨渶澶у嚭搴撲换鍔℃暟
+ if(outWrkMasts.size() >= basCrnp.getMaxOutTask()){
+ News.info("鍫嗗灈鏈�:{} 宸茶揪鏈�澶у嚭搴撲换鍔℃暟锛屽綋鍓嶄换鍔℃暟:{}", basCrnp.getCrnNo(), outWrkMasts.size());
+ throw new CoolException("鍫嗗灈鏈�:" + basCrnp.getCrnNo() + "宸茶揪鏈�澶у嚭搴撲换鍔℃暟锛屽綋鍓嶄换鍔℃暟:" + outWrkMasts.size());
}
// 鑾峰彇宸ヤ綔鍙�
@@ -292,21 +306,17 @@
locMast.setLocSts("R");
locMast.setModiTime(new Date());
locMastService.updateById(locMast);
-
return true;
}
public Integer findCrnNoByLocNo(String locNo) {
List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
- String controlRows = basCrnp.getControlRows();
- if (Cools.isEmpty(controlRows)) {
- continue;
- }
-
- List<Integer> rowList = JSON.parseArray(controlRows, Integer.class);
- if(rowList.contains(Utils.getRow(locNo))) {
- return basCrnp.getCrnNo();
+ List<List<Integer>> rowList = basCrnp.getControlRows$();
+ for (List<Integer> rows : rowList) {
+ if(rows.contains(Utils.getRow(locNo))) {
+ return basCrnp.getCrnNo();
+ }
}
}
return null;
--
Gitblit v1.9.1