From 054e8e34d07b8372f43866ae0e18f8871df992aa Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 13 十一月 2023 13:16:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 79 ++++++++++++++++++++++++---------------
1 files changed, 48 insertions(+), 31 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..80f27d5 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.*;
@@ -592,21 +593,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 +655,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 +732,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){
@@ -763,10 +764,25 @@
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);
}
/*
@@ -823,7 +839,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); //璐存爣绔欑偣
// 鎿嶄綔浜哄憳鏁版嵁
@@ -911,12 +927,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 +939,10 @@
@Override
@Transactional
public void cs2() {
-
+ BasDevp basDevp = basDevpService.selectById(216);
+ basDevp.setWrkNo(0);
+ basDevp.setBarcode("");
+ basDevpService.updateById(basDevp);
}
/*
--
Gitblit v1.9.1