From 3ad65283c54059e0c61110589fb19398ac3525fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 08 七月 2025 08:32:32 +0800
Subject: [PATCH] 完善拣料转全板
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 127 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 119 insertions(+), 8 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 6b77db2..0a50dce 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -3,10 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.SnowflakeIdWorker;
+import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
@@ -105,6 +102,7 @@
}
Date now = new Date();
+ Integer matType = 0;
// 鏃犲崟缁勬墭
if (Cools.isEmpty(param.getOrderNo())) {
@@ -112,11 +110,16 @@
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo(), elem.getCstmr());
+// elem.setBatch("");
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo(), elem.getCstmr(),elem.getOwner());
if (Cools.isEmpty(detlDto.getBatch())){
String batch = DateUtils.convert(new Date(),DateUtils.yyyyMMdd);
detlDto.setBatch(batch);
+ }
+
+ if (Cools.isEmpty(detlDto.getOwner())){
+ detlDto.setOwner(1L);
}
if (DetlDto.has(detlDtos, detlDto)) {
@@ -136,6 +139,7 @@
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
+// waitPakin.setBatch("");
waitPakin.setBatch(detlDto.getBatch());
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
@@ -145,9 +149,21 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setOwner(detlDto.getOwner());
waitPakin.setMemo(detlDto.getMemo());
waitPakin.setFrozen(param.getFrozen()); // 鏄惁鍐荤粨
waitPakin.setManu(detlDto.getCstmr());
+ waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷
+ waitPakin.setMatTypeIn(param.getMatTypeIn());//寮哄埗鐗╂枡绫诲瀷
+ if (Cools.isEmpty(mat.getMatType())){
+ throw new CoolException("鐗╂枡绫诲瀷寮傚父"+mat.getMatnr());
+ }else {
+ if (matType == 0){
+ matType = mat.getMatType();
+ }else if (!matType.equals(mat.getMatType())){
+ throw new CoolException("璇风粍鎵樺悓涓�绫诲瀷鐨勭墿鏂�");
+ }
+ }
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -161,7 +177,7 @@
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
-
+ //elem.setBatch("");
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
if (elem.getAnfme() > orderDetl.getEnableQty()) {
@@ -172,7 +188,12 @@
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getOwner());
+
+ if (Cools.isEmpty(detlDto.getOwner())){
+ detlDto.setOwner(1L);
+ }
+
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
assert one != null;
@@ -189,7 +210,7 @@
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
- waitPakin.setBatch(detlDto.getBatch()); // 搴忓垪鐮�
+ //waitPakin.setBatch(""); // 搴忓垪鐮�
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
@@ -198,6 +219,18 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setOwner(detlDto.getOwner());
+ waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷
+ waitPakin.setMatTypeIn(param.getMatTypeIn()); //寮哄埗鐗╂枡绫诲瀷
+// if (Cools.isEmpty(mat.getMatType())){
+// throw new CoolException("鐗╂枡绫诲瀷寮傚父"+mat.getMatnr());
+// }else {
+// if (matType == 0){
+// matType = mat.getMatType();
+// }else if (matType!=mat.getMatType()){
+// throw new CoolException("璇风粍鎵樺悓涓�绫诲瀷鐨勭墿鏂�");
+// }
+// }
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -253,6 +286,7 @@
checkRecord.setConfirmQty(wrkDetl.getAnfme());
if (Cools.isEmpty(wrkDetlOld)){
wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setZpallet(wrkMast.getBarcode());
wrkDetlService.insert(wrkDetl);
recordRecordLog=recordRecordLog+"\n"+"鏂板涓�鏉℃槑缁�:"+"\t鍟嗗搧缂栧彿锛�"+wrkDetl.getMatnr()+"\t鎵瑰彿锛�"+wrkDetl.getBatch()+"\t鏁伴噺锛�"+wrkDetl.getAnfme();
adjDetl.setOriQty(0.0);
@@ -500,6 +534,7 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -521,4 +556,80 @@
public void pikingToFull(String barcode) {
wrkMastService.selectByBarcode(barcode);
}
+
+ @Override
+ @Transactional
+ public List<WrkDetl> pikingToFull2(Integer wrkNo) {
+ List<WrkDetl> wrkDetlsNew= new ArrayList<WrkDetl>();
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkNo);
+ for (WrkDetl wrkDetl:wrkDetls){
+ String[] orderNos = GetOrderNo(wrkDetl.getOrderNo());
+ if (!Cools.isEmpty(orderNos) && orderNos.length!=0) {
+ Double anfme = wrkDetl.getAnfme();
+ for (String orderNo : orderNos) {
+ OrderDetl orderDetl = orderDetlService.selectItem(orderNo, wrkDetl.getMatnr(), wrkDetl.getBatch());
+ if (orderDetl == null) {
+ orderDetl = orderDetlService.selectItem(orderNo, wrkDetl.getMatnr(), null);
+ if (orderDetl == null) {
+ log.error("ww");
+ return wrkDetlsNew;
+ }
+ }
+ if (orderDetl.getAnfme() <= anfme) {
+ WrkDetl wrkDetl1 = new WrkDetl();
+ wrkDetl1.sync(wrkDetl);
+ wrkDetl1.setOrderNo(orderNo);
+ wrkDetl1.setAnfme(anfme);
+ wrkDetlsNew.add(wrkDetl1);
+ anfme = anfme - orderDetl.getAnfme();
+ } else {
+ WrkDetl wrkDetl1 = new WrkDetl();
+ wrkDetl1.sync(wrkDetl);
+ wrkDetl1.setOrderNo(orderNo);
+ wrkDetl1.setAnfme(anfme);
+ wrkDetlsNew.add(wrkDetl1);
+ }
+ }
+ }else {
+ wrkDetlsNew.add(wrkDetl);
+ }
+ }
+ return wrkDetlsNew;
+ }
+
+ private static String[] GetOrderNo(String orderNo) {
+ String[] s3 = orderNo.split("\"");
+ String[] s = new String[(s3.length - 1) / 6];
+ if (!Cools.isEmpty(s3)){
+ int i = 0;
+ int j = 0;
+ for (String ss : s3) {
+ if (ss.equals("orderNo")) {
+ s[i] = s3[j + 2];
+ i++;
+ }
+ j++;
+ }
+ }else {
+ s=null;
+ }
+ return s;
+ }
+
+ private String[] GetAnfme(String orderNo) {
+ String[] s3 = orderNo.split("\"");
+ String[] s = new String[(s3.length - 1) / 6];
+ int i = 0;
+ int j = 0;
+ for (String ss : s3) {
+ if (ss.equals("anfme")) {
+ String[] s4 = s3[j + 1].split(":");
+ String[] s5 = s4[1].split("\\.");
+ s[i] = s5[0];
+ i++;
+ }
+ j++;
+ }
+ return s;
+ }
}
--
Gitblit v1.9.1