From be25fdca12071375d82a09f78c1235322b4106d0 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 17 一月 2024 14:23:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 202 +++++++++++++++++++++++++------------------------
1 files changed, 103 insertions(+), 99 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 f7788cf..dec99b3 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -13,7 +13,9 @@
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;
@@ -857,107 +859,109 @@
// }
- 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){
- throw new CoolException("鎵樼洏鏉＄爜锛�"+param.getBarcode()+"宸插瓨鍦紝璇峰嬁閲嶅缁勬墭");
- }
- Date now = new Date();
- List<WaitPakin> waitPakins = new ArrayList<>();
- String matnr = null;
- 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() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- matnr = mat.getMatnr();
- WaitPakin waitPakin = new WaitPakin();
- waitPakin.sync(mat);
- waitPakin.setModel(matList.getBatch()); //鎵规
- waitPakin.setSpecs(matList.getSpecs()); //瑙勬牸
- waitPakin.setBatch(matList.getBoxNo()); //鏈ㄧ缂栫爜
- waitPakin.setBrand(param.getBoxType()); //鏈ㄧ绫诲瀷
- waitPakin.setZpallet(param.getBarcode()); //鎵樼洏鐮�
- waitPakin.setOrigin(matList.getPosition()); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
- waitPakin.setIoStatus("Y"); // 鍏ュ嚭鐘舵��
- waitPakin.setAnfme(matList.getAnfme().doubleValue()); // 鏈ㄧ涓摐绠旀暟閲�
- waitPakin.setStatus("Y"); // 鐘舵��
- waitPakin.setAppeUser(userId);
- 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("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
- }
- waitPakins.add(waitPakin);
- }
- LocTypeDto locTypeDto = new LocTypeDto();
- locTypeDto.setLocType1((short)1);
-
- StartupDto dto = commonService.getLocNo(1, 1, param.getPalletizingNo2(), matnr,null,null, locTypeDto);
-
- int workNo = dto.getWorkNo();
- // 鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(new Date());
- wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
- wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
- wrkMast.setIoPri(13D); // 浼樺厛绾�
- wrkMast.setCrnNo(dto.getCrnNo());
- wrkMast.setSourceStaNo(dto.getSourceStaNo());
- wrkMast.setStaNo(dto.getStaNo());
- wrkMast.setLocNo(dto.getLocNo());
- wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setLinkMis("Y");
- wrkMast.setCtnType(0); // 瀹瑰櫒绫诲瀷
- // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast.setAppeTime(now);
- wrkMast.setModiTime(now);
- boolean res = wrkMastService.insert(wrkMast);
- if (!res) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
- // 鐢熸垚宸ヤ綔妗ｆ槑缁�
- waitPakins.forEach(waitPakin -> {
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(waitPakin);
- wrkDetl.setWrkNo(wrkMast.getWrkNo());
- wrkDetl.setIoTime(wrkMast.getIoTime());
- wrkDetl.setAppeTime(now);
- wrkDetl.setModiTime(now);
- if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
- }
- });
- // 鏇存柊鐩爣搴撲綅鐘舵��
- LocMast locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("O")){
- locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)){
- throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
- }
- } else {
- throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
- }
+// 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){
+// throw new CoolException("鎵樼洏鏉＄爜锛�"+param.getBarcode()+"宸插瓨鍦紝璇峰嬁閲嶅缁勬墭");
+// }
+//
+//
+// Date now = new Date();
+// List<WaitPakin> waitPakins = new ArrayList<>();
+// String matnr = null;
+// 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() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+// }
+// matnr = mat.getMatnr();
+// WaitPakin waitPakin = new WaitPakin();
+// waitPakin.sync(mat);
+// waitPakin.setModel(matList.getBatch()); //鎵规
+// waitPakin.setSpecs(matList.getSpecs()); //瑙勬牸
+// waitPakin.setBatch(matList.getBoxNo()); //鏈ㄧ缂栫爜
+// waitPakin.setBrand(param.getBoxType()); //鏈ㄧ绫诲瀷
+// waitPakin.setZpallet(param.getBarcode()); //鎵樼洏鐮�
+// waitPakin.setOrigin(matList.getPosition()); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
+// waitPakin.setIoStatus("Y"); // 鍏ュ嚭鐘舵��
+// waitPakin.setAnfme(matList.getAnfme().doubleValue()); // 鏈ㄧ涓摐绠旀暟閲�
+// waitPakin.setStatus("Y"); // 鐘舵��
+// waitPakin.setAppeUser(userId);
+// 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("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+// }
+// waitPakins.add(waitPakin);
+// }
+// LocTypeDto locTypeDto = new LocTypeDto();
+// locTypeDto.setLocType1((short)1);
+//
+// StartupDto dto = commonService.getLocNo(1, 1, param.getPalletizingNo2(), matnr,null,null, locTypeDto);
+//
+// int workNo = dto.getWorkNo();
+// // 鐢熸垚宸ヤ綔妗�
+// WrkMast wrkMast = new WrkMast();
+// wrkMast.setWrkNo(workNo);
+// wrkMast.setIoTime(new Date());
+// wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
+// wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
+// wrkMast.setIoPri(13D); // 浼樺厛绾�
+// wrkMast.setCrnNo(dto.getCrnNo());
+// wrkMast.setSourceStaNo(dto.getSourceStaNo());
+// wrkMast.setStaNo(dto.getStaNo());
+// wrkMast.setLocNo(dto.getLocNo());
+// wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
+// wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+// wrkMast.setPicking("N"); // 鎷ｆ枡
+// wrkMast.setExitMk("N"); // 閫�鍑�
+// wrkMast.setEmptyMk("N"); // 绌烘澘
+// wrkMast.setLinkMis("Y");
+// wrkMast.setCtnType(0); // 瀹瑰櫒绫诲瀷
+// // 鎿嶄綔浜哄憳鏁版嵁
+// wrkMast.setAppeTime(now);
+// wrkMast.setModiTime(now);
+// boolean res = wrkMastService.insert(wrkMast);
+// if (!res) {
+// throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+// }
+// // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+// waitPakins.forEach(waitPakin -> {
+// WrkDetl wrkDetl = new WrkDetl();
+// wrkDetl.sync(waitPakin);
+// wrkDetl.setWrkNo(wrkMast.getWrkNo());
+// wrkDetl.setIoTime(wrkMast.getIoTime());
+// wrkDetl.setAppeTime(now);
+// wrkDetl.setModiTime(now);
+// if (!wrkDetlService.insert(wrkDetl)) {
+// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+// }
+// });
+// // 鏇存柊鐩爣搴撲綅鐘舵��
+// LocMast locMast = locMastService.selectById(dto.getLocNo());
+// if (locMast.getLocSts().equals("O")){
+// locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+// locMast.setModiTime(now);
+// if (!locMastService.updateById(locMast)){
+// throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+// }
+// } else {
+// throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+// }
}
--
Gitblit v1.9.1