From ee3a4804211a44fe9796caff493635ba15f1b764 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 12 一月 2024 22:16:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 208 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 128 insertions(+), 80 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 8164191..b6cbfdd 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
+import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -60,6 +61,14 @@
private WaitPakinService waitPakinService;
@Autowired
private CommonService commonService;
+ @Autowired
+ private LocDetlRullUpDetailService locDetlRullUpDetailService;
+ @Autowired
+ private WrkDetlSingleService wrkDetlSingleService;
+ @Autowired
+ private WrkMastStaService wrkMastStaService;
+ @Autowired
+ private WrkMastStaLogService wrkMastStaLogService;
@Override
@Transactional
@@ -592,21 +601,28 @@
LabellerMatParam labellerMatParam = new LabellerMatParam();
labellerMatParam.setDevNo(param.getDevNo());
labellerMatParam.setLabNo(param.getLabNo());
- ArrayList<LabellerMatParam.CombMat> combMats = new ArrayList<>();
- String orderNo = "";
+ labellerMatParam.setWrkNo(basDevp.getWrkNo().toString());
+// ArrayList<LabellerMatParam.CombMat> combMats = new ArrayList<>();
+ ArrayList<LabellerMatParam.BoxNo> boxNos = new ArrayList<>();
+// String orderNo = "";
for (WrkDetl wrkDetl:wrkDetls){
- LabellerMatParam.CombMat combMat = new LabellerMatParam.CombMat(wrkDetl);
- orderNo=wrkDetl.getOrderNo();
- combMat.setTemp1("1");
- combMats.add(combMat);
+ LabellerMatParam.BoxNo boxNo = new LabellerMatParam.BoxNo();
+ boxNo.setBoxNo(wrkDetl.getBatch());
+ boxNos.add(boxNo);
}
+ labellerMatParam.setBoxNos(boxNos);
+// for (WrkDetl wrkDetl:wrkDetls){
+// LabellerMatParam.CombMat combMat = new LabellerMatParam.CombMat(wrkDetl);
+// orderNo=wrkDetl.getOrderNo();
+// combMat.setTemp1("1");
+// combMats.add(combMat);
+// }
- labellerMatParam.setCombMats(combMats);
- labellerMatParam.setLabellingTime(DateUtils.convert(new Date()));
- labellerMatParam.setWrkNo(basDevp.getWrkNo().toString());
- labellerMatParam.setLabTemplate("1");
- labellerMatParam.setOrderNo(orderNo);
+// labellerMatParam.setCombMats(combMats);
+// labellerMatParam.setLabellingTime(DateUtils.convert(new Date()));
+// labellerMatParam.setLabTemplate("1");
+// labellerMatParam.setOrderNo(orderNo);
wrkMast.setWrkSts(53L);
if (!wrkMastService.updateById(wrkMast)){
throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
@@ -647,11 +663,12 @@
if (param.getLabResult().equals("OK")){
wrkMast.setWrkSts(54L);
+ wrkMast.setStaNo(144);
if (!wrkMastService.updateById(wrkMast)){
throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
}
}else if (param.getLabResult().equals("NG")){
- wrkMast.setWrkSts(52L);
+ wrkMast.setWrkSts(52L);//閲嶆柊璐存爣
if (!wrkMastService.updateById(wrkMast)){
throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
}
@@ -723,14 +740,6 @@
// }
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type",201).eq("barcode", param.getBarcode()).eq("sta_no",param.getDevNo$()));
- if (Cools.isEmpty(wrkMast) || !wrkMast.getWrkSts().equals(42L)){
- throw new CoolException("鏌ヨ鎵樼洏澶辫触");
- }else {
- wrkMast.setWrkSts(wrkMast.getWrkSts()+1);
- }
-
-
if (locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()))!=0
|| wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()))!=0
|| waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()))!=0){
@@ -740,6 +749,7 @@
Date now = new Date();
for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
+ long rollUp = new Date().getTime();
Mat mat = matService.selectByMatnr(matList.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(matList.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
@@ -759,14 +769,39 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setRollUp(rollUp);
+ if (!Cools.isEmpty(matList.getMatDetlList())){
+ for (PalletizingCompleteParam.MatDetlList matDetlList:matList.getMatDetlList()){
+ LocDetlRullUpDetail locDetlRullUpDetail = new LocDetlRullUpDetail();
+ locDetlRullUpDetail.setUuid(rollUp);
+ locDetlRullUpDetail.setRollNo(matDetlList.getBoxNoDetl());
+ locDetlRullUpDetail.setRollWeight(matDetlList.getWeightDetl().toString());
+ locDetlRullUpDetailService.insert(locDetlRullUpDetail);
+ }
+ }
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
}
- if (!wrkMastService.updateById(wrkMast)){
- throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
- }
+ }
+
+
+ /*
+ *涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏�
+ * */
+ @Override
+ @Transactional
+ public void balconyComplete(LabellerMatParam param) {
+ if (Cools.isEmpty(param.getWrkNo())){
+ throw new CoolException("宸ヤ綔鍙蜂负绌猴紒");
+ }
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getWrkNo()));
+ if (Cools.isEmpty(wrkMast)){
+ throw new CoolException("宸ヤ綔鍙蜂负绌猴紒");
+ }
+ wrkMast.setWrkSts(57L);
+ wrkMastService.updateById(wrkMast);
}
/*
@@ -777,20 +812,14 @@
public void singleUnstackingComplete(SingleUnstackingCompleteParam param) {
Long userId = 8888L;//妗佹灦涓婁綅杞欢
//鍒ゆ柇param鍙傛暟
- if (Cools.isEmpty(param.getBarcode())){
- throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖");
- }else if (Cools.isEmpty(param.getPalletizingNo())){
+ if (Cools.isEmpty(param.getPalletizingNo())){
throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo涓虹┖");
}else if (Cools.isEmpty(param.getMatLists()) || param.getMatLists().size()==0){
throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖");
}
- WrkMast wrkMastMatrix = wrkMastService.selectByBarcode(param.getBarcode());
- if (Cools.isEmpty(wrkMastMatrix)){
- throw new CoolException("鍙傛暟锛氭墭鐩樼爜鏌ヨ宸ヤ綔妗ｅけ璐ワ細"+param.getBarcode());
- }
- List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNoUnstacking(wrkMastMatrix.getWrkNo());
ArrayList<WrkDetl> wrkDetlsNew = new ArrayList<>();
+ ArrayList<WrkDetlSingle> wrkDetlsOld = new ArrayList<>();
//鍒ゆ柇matLists鍙傛暟
for (SingleUnstackingCompleteParam.MatList matList:param.getMatLists()){
if (Cools.isEmpty(matList.getPosition())){
@@ -798,12 +827,14 @@
}else if (Cools.isEmpty(matList.getBoxNo())){
throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo涓虹┖");
}
+ List<WrkDetlSingle> wrkDetlSingles = wrkDetlSingleService.selectList(new EntityWrapper<WrkDetlSingle>().eq("batch", matList.getBoxNo()));
boolean sign=true;
- for (WrkDetl wrkDetl:wrkDetls){
- if (wrkDetl.getBatch().equals(matList.getBoxNo())){//鏈ㄧ缂栫爜
- wrkDetl.setInspect(1);
- wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("batch",wrkDetl.getBatch()));
+ for (WrkDetlSingle wrkDetlSingle:wrkDetlSingles){
+ if (wrkDetlSingle.getBatch().equals(matList.getBoxNo())){//鏈ㄧ缂栫爜
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(wrkDetlSingle);
wrkDetlsNew.add(wrkDetl);
+ wrkDetlsOld.add(wrkDetlSingle);
sign=false;
break;
}
@@ -823,7 +854,7 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(51L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
wrkMast.setIoType(202); // 鍏ュ嚭搴撶姸鎬侊細202.鎷嗗灈鍚庡嚭搴�
- wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setIoPri(99D); // 浼樺厛绾�
wrkMast.setSourceStaNo(param.getDevNo$());
wrkMast.setStaNo(140); //璐存爣绔欑偣
// 鎿嶄綔浜哄憳鏁版嵁
@@ -845,6 +876,13 @@
}
}
+ for (WrkDetlSingle wrkDetlSingle : wrkDetlsOld) {
+ wrkDetlSingleService.delete(new EntityWrapper<WrkDetlSingle>()
+ .eq("batch",wrkDetlSingle.getBatch())
+ .eq("wrk_no",wrkDetlSingle.getWrkNo())
+ .eq("io_time",wrkDetlSingle.getIoTime()));
+ }
+
}
/*
@@ -857,49 +895,50 @@
//鍒ゆ柇param鍙傛暟
if (Cools.isEmpty(param.getBarcode())){
throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖");
- }else if (Cools.isEmpty(param.getPalletizingNo())){
- throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo涓虹┖");
}
+// else if (Cools.isEmpty(param.getPalletizingNo())){
+// throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo涓虹┖");
+// }
WrkMast wrkMastMatrix = wrkMastService.selectByBarcode(param.getBarcode());
if (Cools.isEmpty(wrkMastMatrix)){
throw new CoolException("鍙傛暟锛氭墭鐩樼爜鏌ヨ宸ヤ綔妗ｅけ璐ワ細"+param.getBarcode());
}else {
- if (!wrkMastMatrix.getIoType().equals(101)){
- List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNoUnstacking(wrkMastMatrix.getWrkNo());
- if (Cools.isEmpty(param.getMatLists()) || param.getMatLists().size()==0 || param.getMatLists().size()!=wrkDetls.size()){
- throw new CoolException("杩斿洖鐗╂枡鏄庣粏鏁颁负"+param.getMatLists().size()+",鎵樼洏鐮侊細"+param.getBarcode()+"搴斿墿浣欑墿鏂欐暟锛�"+wrkDetls.size());
- }
-
- ArrayList<String> orgin = new ArrayList<>();
- //鍒ゆ柇matLists鍙傛暟
- for (SingleMountUnstackingCompleteParam.MatList matList : param.getMatLists()){
- if (Cools.isEmpty(matList.getPosition())){
- throw new CoolException("鍙傛暟锛氱爜鍨涗綅缃� position涓虹┖");
- }else if (Cools.isEmpty(matList.getBoxNo())){
- throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo涓虹┖");
- }
- if (!orgin.contains(matList.getPosition())){
- orgin.add(matList.getPosition());
- }else {
- throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBoxNo()+",鏈ㄧ浣嶇疆瀛樺湪閲嶅");
- }
- boolean sign=true;
- for (WrkDetl wrkDetl:wrkDetls){
- if (wrkDetl.getBatch().equals(matList.getBoxNo())){//鏈ㄧ缂栫爜
- wrkDetl.setOrigin(matList.getPosition());
- wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("batch",wrkDetl.getBatch()));
- sign=false;
- break;
- }
- }
- if (sign){
- throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBoxNo()+"鏈煡璇㈠埌瀵瑰簲鐨勫伐浣滄槑缁嗭紒");
- }
- }
- }
+// if (wrkMastMatrix.getIoType().equals(103)){
+// List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNoUnstacking(wrkMastMatrix.getWrkNo());
+// if (Cools.isEmpty(param.getMatLists()) || param.getMatLists().size()==0 || param.getMatLists().size()!=wrkDetls.size()){
+// throw new CoolException("杩斿洖鐗╂枡鏄庣粏鏁颁负"+param.getMatLists().size()+",鎵樼洏鐮侊細"+param.getBarcode()+"搴斿墿浣欑墿鏂欐暟锛�"+wrkDetls.size());
+// }
+//
+// ArrayList<String> orgin = new ArrayList<>();
+// //鍒ゆ柇matLists鍙傛暟
+// for (SingleMountUnstackingCompleteParam.MatList matList : param.getMatLists()){
+// if (Cools.isEmpty(matList.getPosition())){
+// throw new CoolException("鍙傛暟锛氱爜鍨涗綅缃� position涓虹┖");
+// }else if (Cools.isEmpty(matList.getBoxNo())){
+// throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo涓虹┖");
+// }
+// if (!orgin.contains(matList.getPosition())){
+// orgin.add(matList.getPosition());
+// }else {
+// throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBoxNo()+",鏈ㄧ浣嶇疆瀛樺湪閲嶅");
+// }
+// boolean sign=true;
+// for (WrkDetl wrkDetl:wrkDetls){
+// if (wrkDetl.getBatch().equals(matList.getBoxNo())){//鏈ㄧ缂栫爜
+// wrkDetl.setOrigin(matList.getPosition());
+// wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("batch",wrkDetl.getBatch()));
+// sign=false;
+// break;
+// }
+// }
+// if (sign){
+// throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBoxNo()+"鏈煡璇㈠埌瀵瑰簲鐨勫伐浣滄槑缁嗭紒");
+// }
+// }
+// }
}
- wrkMastMatrix.setSheetNo("1");
+ wrkMastMatrix.setSheetNo("2");
if (!wrkMastService.updateById(wrkMastMatrix)){
throw new CoolException("鏇存柊宸ヤ綔妗ｅけ璐�==銆嬫鏋朵笂浣嶈蒋浠讹細鍗曟墭鎷嗗灈瀹屾垚閫氱煡");
}
@@ -911,12 +950,10 @@
@Override
@Transactional
public void cs1(String barcode) {
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 201));
- int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(201));
- wrkMast.setWrkNo(workNo);
- wrkMast.setBarcode(barcode);
- wrkMast.setWrkSts(42L);
- wrkMastService.insert(wrkMast);
+ BasDevp basDevp = basDevpService.selectById(216);
+ basDevp.setWrkNo(9992);
+ basDevp.setBarcode(barcode);
+ basDevpService.updateById(basDevp);
}
/*
@@ -925,7 +962,10 @@
@Override
@Transactional
public void cs2() {
-
+ BasDevp basDevp = basDevpService.selectById(216);
+ basDevp.setWrkNo(0);
+ basDevp.setBarcode("");
+ basDevpService.updateById(basDevp);
}
/*
@@ -934,7 +974,15 @@
@Override
@Transactional
public void cs3() {
-
+ //鎷嗙洏
+ WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),119);
+ wrkMastSta1.setType(2);
+ wrkMastSta1.setWrkType(2);
+ wrkMastStaService.insert(wrkMastSta1);
+ WrkMastSta wrkMastSta2 = new WrkMastSta(new Date(),121);
+ wrkMastSta2.setType(2);
+ wrkMastSta2.setWrkType(2);
+ wrkMastStaService.insert(wrkMastSta2);
}
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
--
Gitblit v1.9.1