From aa2ef2ef37c7d95cfb1d3833a023328d05ea5060 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期日, 21 一月 2024 15:06:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 138 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 118 insertions(+), 20 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 b6cbfdd..40387db 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
@@ -12,11 +13,17 @@
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
+import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.MatUtils;
+import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.LocTypeDto;
+import com.zy.common.model.StartupDto;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import com.zy.common.utils.NodeUtils;
+import com.zy.common.web.WcsController;
+import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -69,6 +76,10 @@
private WrkMastStaService wrkMastStaService;
@Autowired
private WrkMastStaLogService wrkMastStaLogService;
+ @Autowired
+ private StaDescService staDescService;
+ @Autowired
+ private LocMastService locMastService;
@Override
@Transactional
@@ -683,7 +694,7 @@
* */
@Override
@Transactional
- public void palletizingComplete(PalletizingCompleteParam param) {
+ public void palletizingComplete(PalletizingCompleteParam2 param) {
Long userId = 7777L;//涓帶
//鍒ゆ柇param鍙傛暟
if (Cools.isEmpty(param.getBarcode())){
@@ -699,7 +710,7 @@
ArrayList<String> positions = new ArrayList<>(); //鏈ㄧ浣嶇疆鏌ラ噸 (orgin)
ArrayList<String> boxNos = new ArrayList<>(); //鏈ㄧ鍞竴缂栫爜鏌ラ噸 锛坆atch锛�
//鍒ゆ柇matLists鍙傛暟
- for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
+ for (PalletizingCompleteParam2.MatList matList:param.getMatLists()){
if (Cools.isEmpty(matList.getMatnr())){
throw new CoolException("鍙傛暟锛氱墿鏂欑紪鐮� matnr涓虹┖");
}else if (Cools.isEmpty(matList.getPosition())){
@@ -748,7 +759,7 @@
Date now = new Date();
- for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
+ for (PalletizingCompleteParam2.MatList matList:param.getMatLists()){
long rollUp = new Date().getTime();
Mat mat = matService.selectByMatnr(matList.getMatnr());
if (Cools.isEmpty(mat)) {
@@ -771,7 +782,7 @@
waitPakin.setModiTime(now);
waitPakin.setRollUp(rollUp);
if (!Cools.isEmpty(matList.getMatDetlList())){
- for (PalletizingCompleteParam.MatDetlList matDetlList:matList.getMatDetlList()){
+ for (PalletizingCompleteParam2.MatDetlList matDetlList:matList.getMatDetlList()){
LocDetlRullUpDetail locDetlRullUpDetail = new LocDetlRullUpDetail();
locDetlRullUpDetail.setUuid(rollUp);
locDetlRullUpDetail.setRollNo(matDetlList.getBoxNoDetl());
@@ -784,6 +795,26 @@
}
}
+ }
+
+ /*
+ * 鏉剧洓(1妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ * */
+ @Override
+ @Transactional
+ public void palletizingCompleteS(PalletizingCompleteParam param) {
+ //鍒ゆ柇param鍙傛暟
+ if (Cools.isEmpty(param.getBarcode())){
+ throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖");
+ }
+
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+ if (Cools.isEmpty(wrkMast) || wrkMast.getWrkSts()!=2){
+ log.error("閫�搴撶爜鍨涘畬鎴愶紝杩斿洖鎵樼洏鐮佹湭鏌ヨ鍒板伐浣滄。妗堬紒");
+ throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode鏈煡璇㈠埌宸ヤ綔妗ｆ");
+ }
+ wrkMast.setSheetNo("4");
+ wrkMastService.updateById(wrkMast);
}
@@ -814,14 +845,14 @@
//鍒ゆ柇param鍙傛暟
if (Cools.isEmpty(param.getPalletizingNo())){
throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo涓虹┖");
- }else if (Cools.isEmpty(param.getMatLists()) || param.getMatLists().size()==0){
+ }else if (Cools.isEmpty(param.getMatList()) || param.getMatList().size()==0){
throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖");
}
ArrayList<WrkDetl> wrkDetlsNew = new ArrayList<>();
ArrayList<WrkDetlSingle> wrkDetlsOld = new ArrayList<>();
//鍒ゆ柇matLists鍙傛暟
- for (SingleUnstackingCompleteParam.MatList matList:param.getMatLists()){
+ for (SingleUnstackingCompleteParam.MatList matList:param.getMatList()){
if (Cools.isEmpty(matList.getPosition())){
throw new CoolException("鍙傛暟锛氱爜鍨涗綅缃� position涓虹┖");
}else if (Cools.isEmpty(matList.getBoxNo())){
@@ -856,7 +887,7 @@
wrkMast.setIoType(202); // 鍏ュ嚭搴撶姸鎬侊細202.鎷嗗灈鍚庡嚭搴�
wrkMast.setIoPri(99D); // 浼樺厛绾�
wrkMast.setSourceStaNo(param.getDevNo$());
- wrkMast.setStaNo(140); //璐存爣绔欑偣
+ wrkMast.setStaNo(144); //璐存爣绔欑偣 鐩存帴鍒板熬绔�
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeUser(userId);
wrkMast.setAppeTime(now);
@@ -962,27 +993,94 @@
@Override
@Transactional
public void cs2() {
- BasDevp basDevp = basDevpService.selectById(216);
- basDevp.setWrkNo(0);
- basDevp.setBarcode("");
- basDevpService.updateById(basDevp);
+// int[] staNos =new int[]{122};
+// for (Integer staNo:staNos){
+// int[] crnNos =new int[]{6};
+// for (Integer crnNo:crnNos){
+// descSta(staNo,crnNo);
+// }
+// }
+
}
- /*
+ private void descSta(Integer staNo,Integer crnNo){
+// int[] typeNos =new int[]{1,10,53,101,103,110};
+ int[] typeNos =new int[]{10,110};
+ for (Integer typeNo:typeNos){
+ descSta3(staNo,crnNo,typeNo);
+ }
+ }
+
+ private void descSta3(Integer staNo,Integer crnNo,Integer typeNo){
+ StaDesc staDesc = new StaDesc();
+ staDesc.setTypeNo(typeNo);
+ staDesc.setStnNo(staNo);
+ staDesc.setCrnNo(crnNo);
+ staDesc.setCrnStn(CrnNoRC(crnNo,staDesc.getTypeNo()>100));
+ descSta2(staDesc);
+ }
+
+ private void descSta2(StaDesc staDesc){
+ Date now = new Date();
+ //鍏ュ簱
+ int sameRes = staDescService.selectCount(new EntityWrapper<StaDesc>()
+ .eq("type_no", staDesc.getTypeNo())
+ .eq("stn_no", staDesc.getStnNo())
+ .eq("crn_no", staDesc.getCrnNo())
+ .eq("crn_stn", staDesc.getCrnStn()));
+ if (sameRes == 0) {
+ staDesc.setModiUser(9527L);
+ staDesc.setModiTime(now);
+ staDesc.setAppeUser(9527L);
+ staDesc.setAppeTime(now);
+ staDescService.insert(staDesc);
+ }
+ }
+
+ private Integer CrnNoRC(Integer crnNo,boolean sign){
+ Integer crnStn = 0;
+ switch (crnNo){
+ case 1:
+ crnStn = 102;
+ break;
+ case 2:
+ crnStn = 105;
+ break;
+ case 3:
+ crnStn = 108;
+ break;
+ case 4:
+ crnStn = 111;
+ break;
+ case 5:
+ crnStn = 114;
+ break;
+ case 6:
+ crnStn = 117;
+ break;
+ }
+ if (sign){
+ return crnStn-2;
+ }
+ return crnStn;
+ }
+
+
+ /*
*
* */
@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);
+// 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