From 56e0f5a507f990d5695d84361341c1ea23194589 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 20 七月 2025 23:49:22 +0800
Subject: [PATCH] 订单出库完成扣减工作数量
---
src/main/java/com/zy/common/web/WcsController.java | 568 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 439 insertions(+), 129 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 7026987..1f22cba 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -8,14 +8,18 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
+import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
+import com.zy.asrs.mapper.BasCrnpMapper;
import com.zy.asrs.mapper.LocMastMapper;
+import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.common.web.param.CanningLineInLocParam;
import com.zy.common.web.param.SearchLocParam;
+import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,10 +28,8 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2020/10/30
@@ -65,6 +67,21 @@
@Resource
private ConfigService configService;
+ @Resource
+ private WrkMastMapper wrkMastMapper;
+
+ @Resource
+ private BasCrnpMapper basCrnpMapper;
+
+ public static final Map<Integer,ArrayList<Integer>> crnOutSite;
+
+ static {
+ crnOutSite = new HashMap<>();
+ crnOutSite.put(1,new ArrayList<Integer>(){{add(1091);add(1092);add(1093);}});
+ crnOutSite.put(2,new ArrayList<Integer>(){{add(1097);add(1098);add(1099);}});
+ crnOutSite.put(3,new ArrayList<Integer>(){{add(1105);add(1106);add(1107);}});
+ }
+
@PostMapping("/pakin/loc/v1")
@ResponseBody
@Transactional
@@ -80,22 +97,6 @@
if (param.getIoType() == 1) {
// 鍏堝垱寤哄叆搴撻�氱煡妗�
waitPakin = comb(param.getBarcode(),param.getBucketType(),param.getBucketCount());
-// if (Cools.isEmpty(param.getBarcode())) {
-// return R.error("鏉＄爜涓嶈兘涓虹┖");
-// }
-// waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
-// if (Cools.isEmpty(waitPakins)) {
-// WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
-// if (wrkMast != null && wrkMast.getIoType() == 103) {
-// return R.parse(CodeRes.PICK_600);
-// }
-// return R.parse(CodeRes.NO_COMB_700);
-// }
-// int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
-// int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
-// if (countLoc > 0 || countWrk > 0) {
-// return R.error(CodeRes.EXIST_500);
-// }
}
if (Cools.isEmpty(param.getLocType1())){
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
@@ -108,28 +109,47 @@
StartupDto dto = null;
+ // 鍏ュ簱鏈夊紓甯稿嚭鍒板嚭搴撳彛1024
+ if(!Cools.isEmpty(param.getErrMsg())){
+ return exceptionIsOutOfTheWarehouse(param,sourceStaNo,waitPakin);
+ }
+
if(param.getIoType() == 1) {
- Map<Integer, String> wantBucketFlag = param.getWantBucketFlag();
- if(!wantBucketFlag.isEmpty()) {
- if(waitPakin == null) {
- return R.error("鍏ュ簱閫氱煡妗ｄ负绌�");
- } else {
- dto = startupFullPutStore(param,waitPakin); // 鐩翠緵缃愯绾夸换鍔�
- if (dto != null) {
- log.info("WCS鍏ュ簱鐩翠緵缃愯绾挎帴鍙ｈ繑鍙�:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
- return R.ok().add(dto);
+ List<SearchLocParam.WantBucket> wantBucketFlag = param.getWantBucketFlag();
+ for(SearchLocParam.WantBucket wantBucket: wantBucketFlag) {
+ if(wantBucket.getBucketType() != 0 && wantBucket.getBucketType() == param.getBucketType() && wantBucket.getWantBucketCount() >= 1) { // 缃愯绾挎湁瑕佹《淇″彿骞朵笖褰撳墠妗舵槸缃愯绾胯鐨勬《
+ if(waitPakin == null) {
+ return R.error("鍏ュ簱閫氱煡妗ｄ负绌�");
+ } else {
+ // <4 < 2 < 4
+ int count = wrkMastMapper.selectInGzxCount(wantBucket.getSite());
+// int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wantBucket.getSite()));
+ if(wantBucket.getSite() == 1071 && count < 4 || wantBucket.getSite() == 1064 && count < 2 || wantBucket.getSite() == 1078 && count < 4) {
+ dto = startupFullPutStore(param,waitPakin,wantBucket); // 鐩翠緵缃愯绾夸换鍔�
+ if (dto != null) {
+ log.info("WCS鍏ュ簱鐩翠緵缃愯绾挎帴鍙ｈ繑鍙�:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
+ return R.ok().add(dto);
+ }
+ } else {
+ log.warn("鐩翠緵鐏岃绾夸换鍔″凡婊★紝鍏ユ垚鍝佸簱,鍏ュ簱鐩爣绔欑偣{}锛屼换鍔℃暟锛歿}",wantBucket.getSite(),count);
+ }
}
}
}
+ }
+ // 1.姣嶆墭鐩橈紝2瀛愭墭鐩�
+ int flag = 0;
+ if(param.getIoType() == 10) {
+ flag = param.getBucketType() == 21 ? 1 : 2 ;
}
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
assert waitPakin != null;
- dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakin, param.getLocArea(),param.isTailSupportFlag());
+ dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakin, param.isTailSupportFlag());
break;
case 10://绌烘墭鐩樺叆搴�
- dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(), 1);
+ dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(), 1, flag);
break;
default:
break;
@@ -138,11 +158,78 @@
return R.ok().add(dto);
}
+ /**
+ * 鍏ュ簱寮傚父鍑哄埌鍑哄簱鍙�1024
+ */
+ @Transactional(propagation = Propagation.REQUIRED)
+ public R exceptionIsOutOfTheWarehouse(SearchLocParam param, BasDevp sourceStaNo,WaitPakin waitPakin) {
+
+ StartupDto dto = commonService.getLocNo(param,1024);
+ int workNo = dto.getWorkNo();
+ Date now = new Date();
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(2L);
+ wrkMast.setIoType(3); // 鍏ュ嚭搴撶姸鎬侊細3.绔欏埌绔�
+ wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setSourceStaNo(dto.getSourceStaNo());
+ wrkMast.setStaNo(dto.getStaNo());
+ wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+ wrkMast.setCtnType(0); // 灏炬墭鏍囪瘑
+ wrkMast.setPdcType(waitPakin != null ? waitPakin.getMaktx() : ""); // 绌烘《绫诲瀷
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ wrkMast.setLocNo(param.getErrMsg()); // 寮傚父鎻忚堪浣撶幇鍦ㄧ洰鏍囧簱浣嶄笂
+ boolean res = wrkMastService.insert(wrkMast);
+ if (!res) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ if(waitPakin != null) {
+ 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("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
+ Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
+ .eq("zpallet", param.getBarcode());
+ WaitPakin setParam = new WaitPakin();
+ setParam.setLocNo(dto.getLocNo());
+ setParam.setIoStatus("Y");
+ setParam.setModiTime(now);
+ if (!waitPakinService.update(setParam, wrapper)) {
+ throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
+ }
+ }
+
+ // 鏇存柊婧愮珯鐐逛俊鎭�
+ sourceStaNo.setWrkNo(workNo);
+ sourceStaNo.setModiTime(now);
+ if (!basDevpService.updateById(sourceStaNo)){
+ throw new CoolException("鏇存柊婧愮珯澶辫触");
+ }
+
+ return R.ok(dto);
+ }
+
// 缃愯瀹屾垚鍏ュ簱
@PostMapping("/pakin/CanningLine/loc/v1")
@ResponseBody
@Transactional
- public synchronized R getLocNo(@RequestBody CanningLineInLocParam param) {
+ public synchronized R inCanningLine(@RequestBody CanningLineInLocParam param) {
log.info("鏀跺埌WCS缃愯鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
if (Cools.isEmpty(param.getWrkNo())) {
return R.error("宸ヤ綔鍙蜂笉鑳戒负绌�");
@@ -155,71 +242,263 @@
WrkMast wrkMast1 = wrkMastService.selectById(param.getWrkNo());
// 鏍规嵁浠诲姟鍙锋煡璇换鍔℃槑缁�
WrkDetl wrkDetl1 = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast1.getWrkNo()));
- // 鍒嗛厤搴撲綅
- StartupDto dto = commonService.getLocNoNew(1, param.getSourceStaNo(), null, 1);
- // 鍒涘缓鏂颁换鍔�
- int workNo = dto.getWorkNo();
+ Mat mat = matService.selectByMatnr(param.getMatnr());
+ if (mat == null) {
+ log.error("缃愯瀹屾垚鍏ュ簱锛屽弽棣堢粰wcs鎴愬搧鏍囪瘑涓嶅瓨鍦細{}",param.getMatnr());
+ return R.error("缃愯瀹屾垚鍏ュ簱锛屽弽棣堢粰wcs鎴愬搧鏍囪瘑涓嶅瓨鍦細" + param.getMatnr());
+ }
+
+ // 鑾峰彇绯荤粺閰嶇疆锛岀湅鎴愬搧缃愯瀹屾垚鏄惁鐩存帴鍑哄埌鍙戣揣鍙�
+ Config config = configService.selectConfigByCode("gzxfh" + param.getSourceStaNo());
+ boolean fhFlag = false;
+ int fhk = 0; // 鍙戣揣鍙�
+ if (config != null && config.getStatus() == 1 && !Cools.isEmpty(config.getValue())) {
+ fhFlag = true;
+ fhk = Integer.parseInt(config.getValue());
+ }
+
Date now = new Date();
- // 鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(now);
- wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱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(wrkMast1.getBarcode()); // 鎵樼洏鐮�
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setLinkMis("Y");
- wrkMast.setCtnType(wrkMast1.getCtnType()); // 灏炬墭鏍囪瘑
- wrkMast.setPdcType(wrkMast1.getPdcType()); // 绌烘《绫诲瀷
- wrkMast.setAppeTime(now);
- boolean res = wrkMastService.insert(wrkMast);
- if (!res) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
+ StartupDto dto;
- // 鐢熸垚宸ヤ綔妗ｆ槑缁�
- // todo 鍏ユ垚鍝佹《搴撶殑鐗╂枡 杩欓噷鍏堟牴鎹┖妗剁被鍨嬫寚瀹氭垚鍝佹《鐗╂枡
- String matnr;
- if(wrkMast1.getPdcType().equals("208L")) {
- matnr = "YJ2025011814414206";
- } else {
- matnr = "YJ2025011814412359";
- }
- Mat mat = matService.selectByMatnr(matnr);
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(mat);
- wrkDetl.setWrkNo(workNo);
- wrkDetl.setAnfme(wrkDetl1.getAnfme());
- wrkDetl.setZpallet(wrkMast1.getBarcode());
- wrkDetl.setIoTime(now);
- wrkDetl.setAppeTime(now);
- if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
- }
+ // 鍒ゆ柇璐存爣寮傚父锛屽妫�閲嶉噺寮傚父鐨勶紝涓嶅垎閰嶅簱浣嶏紝鍘诲線寮傚父鍙�1090
+ if ( !param.isTbFlag() || !param.isReinspection()) {
- // 瀹屾垚鏃т换鍔�(鐩翠緵缃愯绾夸换鍔℃墜鍔ㄥ畬鎴�,鍑哄簱浠诲姟浠诲姟鍙锋秷澶变細鑷姩瀹屾垚)
- if (wrkMast1.getIoType() == 2) {
- wrkMast1.setWrkSts(4L);
+ // 鐢熸垚宸ヤ綔妗� ------------------------------------------------------
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(commonService.getWorkNo(0));
+ wrkMast.setIoTime(now);
+ wrkMast.setIoType(3); // 鍏ュ嚭搴撶被鍨�3.绔欏埌绔�
+ wrkMast.setWrkSts(2L);
+ wrkMast.setIoPri(13D); // 浼樺厛绾�
+// wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setSourceStaNo(param.getSourceStaNo());
+ wrkMast.setStaNo(1090);
+ wrkMast.setLocNo(!param.isTbFlag() ? "璐存爣澶辫触" : "澶嶆閲嶉噺寮傚父");
+ wrkMast.setBarcode(wrkMast1.getBarcode()); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+// wrkMast.setPicking("N"); // 鎷ｆ枡
+// wrkMast.setExitMk("N"); // 閫�鍑�
+// wrkMast.setEmptyMk("N"); // 绌烘澘
+// wrkMast.setLinkMis("Y");
+// wrkMast.setCtnType(wrkMast1.getCtnType()); // 灏炬墭鏍囪瘑
+ wrkMast.setPdcType(wrkMast1.getPdcType()); // 绌烘《绫诲瀷
+ wrkMast.setAppeTime(now);
+ wrkMastService.insert(wrkMast);
+
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�----------------------------------------------------
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(mat);
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setAnfme(wrkDetl1.getAnfme());
+ wrkDetl.setZpallet(wrkMast1.getBarcode());
+ wrkDetl.setBatch(param.getBatch());
+ wrkDetl.setManuDate(param.getManuDate());
+ wrkDetl.setWeight(param.getWeight());
+ wrkDetl.setManLength(param.getGrossWeight());
+ wrkDetl.setVolume(param.getCannedVolume()); // 缃愯閲�
+ wrkDetl.setInspect(param.isTbFlag()?1:0); // 璐存爣鎴愬姛
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModel(wrkDetl1.getMaktx()); // 淇濆瓨绌烘《鍚嶇О
+ wrkDetlService.insert(wrkDetl);
+
+ dto = new StartupDto();
+ dto.setWorkNo(wrkMast.getWrkNo());
+ dto.setSourceStaNo(wrkMast.getSourceStaNo());
+ dto.setStaNo(wrkMast.getStaNo());
+ } else
+ if(fhFlag) { // 鐩存帴鍙戣揣
+ // 鐢熸垚宸ヤ綔妗� ------------------------------------------------------
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(commonService.getWorkNo(0));
+ wrkMast.setIoTime(now);
+ wrkMast.setIoType(3); // 鍏ュ嚭搴撶被鍨�3.绔欏埌绔�
+ wrkMast.setWrkSts(2L);
+ wrkMast.setIoPri(13D); // 浼樺厛绾�
+// wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setSourceStaNo(param.getSourceStaNo());
+ wrkMast.setStaNo(fhk);
+// wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setBarcode(wrkMast1.getBarcode()); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+// wrkMast.setPicking("N"); // 鎷ｆ枡
+// wrkMast.setExitMk("N"); // 閫�鍑�
+// wrkMast.setEmptyMk("N"); // 绌烘澘
+// wrkMast.setLinkMis("Y");
+// wrkMast.setCtnType(wrkMast1.getCtnType()); // 灏炬墭鏍囪瘑
+ wrkMast.setPdcType(wrkMast1.getPdcType()); // 绌烘《绫诲瀷
+ wrkMast.setAppeTime(now);
+ wrkMastService.insert(wrkMast);
+
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�----------------------------------------------------
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(mat);
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setAnfme(wrkDetl1.getAnfme());
+ wrkDetl.setZpallet(wrkMast1.getBarcode());
+ wrkDetl.setBatch(param.getBatch());
+ wrkDetl.setManuDate(param.getManuDate());
+ wrkDetl.setWeight(param.getWeight());
+ wrkDetl.setManLength(param.getGrossWeight());
+ wrkDetl.setVolume(param.getCannedVolume()); // 缃愯閲�
+ wrkDetl.setInspect(1);
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModel(wrkDetl1.getMaktx()); // 淇濆瓨绌烘《鍚嶇О
+ wrkDetlService.insert(wrkDetl);
+
+ dto = new StartupDto();
+ dto.setWorkNo(wrkMast.getWrkNo());
+ dto.setSourceStaNo(wrkMast.getSourceStaNo());
+ dto.setStaNo(wrkMast.getStaNo());
+ } else { // 妫�娴嬫垚鍔燂紝鍏ユ垚鍝佸簱
+ // 妫�绱㈠簱浣嶆潯浠�
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
+ findLocNoAttributeVo.setMatnr(wrkDetl1.getMatnr());
+ findLocNoAttributeVo.setModel(wrkDetl1.getModel());
+
+ // 鍒嗛厤搴撲綅
+ dto = commonService.getLocNoNew(1, param.getSourceStaNo(), findLocNoAttributeVo, 1);
+
+ // 鍒涘缓鏂颁换鍔�
+ int workNo = dto.getWorkNo();
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱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(wrkMast1.getBarcode()); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+// wrkMast.setCtnType(wrkMast1.getCtnType()); // 灏炬墭鏍囪瘑
+ wrkMast.setPdcType(wrkMast1.getPdcType()); // 绌烘《绫诲瀷
+ wrkMast.setAppeTime(now);
+ wrkMastService.insert(wrkMast);
+
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(mat);
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setAnfme(wrkDetl1.getAnfme());
+ wrkDetl.setZpallet(wrkMast1.getBarcode());
+ wrkDetl.setBatch(param.getBatch());
+ wrkDetl.setManuDate(param.getManuDate());
+ wrkDetl.setWeight(param.getWeight());
+ wrkDetl.setManLength(param.getGrossWeight());
+ wrkDetl.setVolume(param.getCannedVolume());
+ wrkDetl.setInspect(1); // 璐存爣鎴愬姛
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAppeTime(now);
+ log.warn("鎴愬搧缃愯瀹屾垚锛屾《绫诲瀷淇濆瓨锛屾柊浠诲姟鍙凤細{},鏃т换鍔″彿:{},鏃т换鍔℃《鍨�:{}",workNo,wrkMast1.getWrkNo(),wrkDetl1.getMaktx());
+ wrkDetl.setModel(wrkDetl1.getMaktx()); // 淇濆瓨绌烘《鍚嶇О
+ wrkDetlService.insert(wrkDetl);
+
+ // 鏇存柊鐩爣搴撲綅鐘舵��
+ 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 {
+ log.error(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
+ }
+ }
+
+ // 瀹屾垚鏃т换鍔�(鐩翠緵缃愯绾夸换鍔℃墜鍔ㄥ畬鎴�)
+ if (wrkMast1.getIoType() == 3 && wrkMast1.getWrkSts() == 2) {
+ wrkMast1.setWrkSts(5L);
wrkMast1.setModiTime(now);
wrkMastService.updateById(wrkMast1);
+ } else if(wrkMast1.getIoType() == 101 && wrkMast1.getWrkSts() == 2) {
+ wrkMast1.setWrkSts(15L);
+ wrkMast1.setModiTime(now);
+ wrkMastService.updateById(wrkMast1);
+ } else {
+ log.error("缃愯瀹屾垚锛屽畬鎴愭棫浠诲姟澶辫触锛歿}",wrkMast1.getWrkNo());
+ return R.parse("缃愯瀹屾垚锛屽畬鎴愭棫浠诲姟澶辫触:"+wrkMast1.getWrkNo());
}
// 鏇存柊婧愮珯鐐逛俊鎭�
BasDevp basDevp = basDevpService.selectById(param.getSourceStaNo());
- basDevp.setWrkNo(workNo);
+ basDevp.setWrkNo(dto.getWorkNo());
basDevp.setModiTime(now);
if (!basDevpService.updateById(basDevp)) {
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
+
+ log.info("WCS缃愯鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, wrkMast1.getBarcode());
+ return R.ok(dto);
+ }
+
+ // 寮傚父鍙ｅ叆搴擄紝鑾峰彇搴撲綅
+ @PostMapping("/pakin/abnormalMouthWarehousing/loc/v1")
+ @ResponseBody
+ @Transactional
+ public synchronized R abnormalMouthWarehousing(@RequestBody CanningLineInLocParam param) {
+ log.info("鏀跺埌WCS寮傚父鍙ｅ叆搴撴帴鍙ｈ姹�====>>鍏ュ弬:{}", param);
+ int wrkNo = param.getWrkNo();
+ Integer sourceStaNo = param.getSourceStaNo();
+ if (Cools.isEmpty(wrkNo)) {
+ return R.error("宸ヤ綔鍙蜂笉鑳戒负绌�");
+ }
+ if (Cools.isEmpty(sourceStaNo)) {
+ return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
+ }
+
+ Date now = new Date();
+ StartupDto dto;
+
+ WrkMast wrkMast = wrkMastService.selectById(wrkNo);
+ if (wrkMast == null) {
+ throw new CoolException("寮傚父鍙ｅ叆搴撲换鍔″彿鏃犱换鍔★細" + wrkNo);
+ } else if (wrkMast.getLocNo() != null && wrkMast.getLocNo().length() == 7) {
+ throw new CoolException("寮傚父鍙ｅ叆搴撳簱浣嶅凡鍒嗛厤锛�" + wrkMast.getLocNo());
+ }
+
+ if(!param.isTbFlag()) { //涓嬬嚎鍑哄簱
+ Config config = configService.selectConfigByCode("gzxfh" + wrkMast.getSourceStaNo());
+ wrkMast.setSourceStaNo(1090);
+ wrkMast.setStaNo(1024); // 寮傚父涓嬬嚎榛樿鍏ュ簱绔欑偣涓�1024
+ // 鑾峰彇绯荤粺閰嶇疆锛岀湅鎴愬搧缃愯瀹屾垚鏄惁鐩存帴鍑哄埌鍙戣揣鍙�
+ if (config != null && config.getStatus() == 1 && !Cools.isEmpty(config.getValue())) {
+ wrkMast.setStaNo(Integer.parseInt(config.getValue()));
+ }
+ wrkMastService.updateById(wrkMast);
+ log.info("WCS寮傚父鍙ｅ叆搴撴帴鍙ｈ繑鍙�:{},鐩爣绔欑偣:{}", "涓嬬嚎鍑哄簱", wrkMast.getStaNo());
+ return R.ok();
+ }
+
+
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
+
+ // 妫�绱㈠簱浣嶆潯浠�
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
+ findLocNoAttributeVo.setMatnr(wrkDetl.getMatnr());
+ findLocNoAttributeVo.setModel(wrkDetl.getModel());
+
+ // 鍒嗛厤搴撲綅
+ dto = commonService.getLocNoNew(1, param.getSourceStaNo(), findLocNoAttributeVo, 1);
+
+ dto.setWorkNo(wrkMast.getWrkNo()); // 浣跨敤鍘熷伐浣滃彿
+ wrkMast.setIoType(1); // 鍏ュ嚭搴撶被鍨� 1.鍏ュ簱
+ wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setSourceStaNo(dto.getSourceStaNo());
+ wrkMast.setStaNo(dto.getStaNo());
+ wrkMastService.updateById(wrkMast);
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
@@ -234,12 +513,20 @@
throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
- log.info("WCS缃愯鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, wrkMast1.getBarcode());
+ // 鏇存柊婧愮珯鐐逛俊鎭�
+ BasDevp basDevp = basDevpService.selectById(sourceStaNo);
+ basDevp.setWrkNo(dto.getWorkNo());
+ basDevp.setModiTime(now);
+ if (!basDevpService.updateById(basDevp)) {
+ throw new CoolException("鏇存柊婧愮珯澶辫触");
+ }
+
+ log.info("WCS寮傚父鍙ｅ叆搴撴帴鍙ｈ繑鍙�:{},鎵樼洏鐮�:{}", dto, wrkMast.getBarcode());
return R.ok(dto);
}
@Transactional(propagation = Propagation.REQUIRED)
- public WaitPakin comb(String barcode, String matnr,int bucketCount) {
+ public WaitPakin comb(String barcode, int matnr,int bucketCount) {
if (Cools.isEmpty(barcode, matnr,bucketCount)) {
throw new CoolException(BaseRes.PARAM);
}
@@ -282,7 +569,7 @@
// for (DetlDto detlDto : detlDtos) {
- Mat mat = matService.selectByMatnr(matnr);
+ Mat mat = matService.selectByMatnr(String.valueOf(matnr));
if (Cools.isEmpty(mat)) {
throw new CoolException(matnr + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
@@ -408,6 +695,15 @@
return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:"+wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
}
+ // 鑷姩鍑虹┖妗�
+ @PostMapping("/autoOutEmptyBucket")
+ @ResponseBody
+ public R autoOutEmptyBucket(@RequestBody StockOutParam param){
+ log.info("鏀跺埌WCS鑷姩鍑虹┖妗舵帴鍙ｈ姹�====>>鍏ュ弬:{}", param);
+ workService.startupFullTakeStore(param, 29L);
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
@PostMapping("auto/emptyOut/v1")
@ResponseBody
public R autoEmptyOut(@RequestBody Map<String,String> emptyPalletSite){
@@ -416,18 +712,47 @@
// 鍑哄簱绔欑偣
Integer site = Integer.valueOf(emptyPalletSite.get("site"));
- LocMast locMast;
+ LocMast locMast = null;
- // 鍏堟壘娴呭簱浣�
- locMast = locMastMapper.queryLocMasterByLocStsAndRow(Arrays.asList(2, 3), type);
+ List<BasCrnp> basCrnps = basCrnpMapper.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts", 3).eq("crn_err", 0).in("crn_no",1,2,3)
+ .eq("out_enable","Y"));
+ if (basCrnps.size() == 0) {
+ log.error("绌烘嫋鍑哄簱璇锋眰搴撲綅澶辫触锛屾病鏈夎仈鏈哄爢鍨涙満鎴栧爢鍨涙満寮傚父");
+ throw new CoolException("绌烘嫋鍑哄簱璇锋眰搴撲綅澶辫触锛屾病鏈夎仈鏈哄爢鍨涙満鎴栧爢鍨涙満寮傚父");
+ }
- // 娴呭簱浣嶆病鏈夊垯鏌ヨ鎵�鏈�
- if (locMast == null) {
- locMast = locMastMapper.queryLocMasterByLocStsAndRow(null, type);
+ List<BasCrnp> basCrnpList = new ArrayList<>();
+ for(BasCrnp basCrnp: basCrnps) {
+ List<BasDevp> devps = basDevpService.selectList(new EntityWrapper<BasDevp>().in("dev_no", crnOutSite.get(basCrnp.getCrnNo())).ne("wrk_no", 0));
+ long count = devps.stream().map(BasDevp::getWrkNo).distinct().count();
+ basCrnp.setWrkNo(count + basCrnp.getWrkNo() >= 5001 && basCrnp.getWrkNo() <= 9000 ? 1 : 0);
+ basCrnpList.add(basCrnp);
+ }
+
+ basCrnpList = basCrnpList.stream().sorted(Comparator.comparing(BasCrnp::getWrkNo).thenComparing(BasCrnp::getCrnNo,Comparator.reverseOrder())).collect(Collectors.toList());
+
+ for(BasCrnp basCrnp:basCrnpList) {
+ Integer crnNo = basCrnp.getCrnNo();
+ Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>().eq("loc_sts", type)
+ .eq("crn_no", crnNo).orderBy("lev1").orderBy("bay1").orderBy("row1");
+ if (crnNo == 1) {
+ wrapper.in("row1", 1, 4);
+ }
+ locMast = locMastService.selectOne(wrapper);
+ if (locMast != null) {
+ break;
+ }
+ // 娣卞簱浣嶆病鏈変簡鍒欒幏鍙栦竴涓祬搴撲綅
+ if (crnNo == 1) {
+ locMast = locMastService.selectOne(wrapper.in("row1", 2, 3));
+ if (locMast != null) {
+ break;
+ }
+ }
}
if (locMast == null) {
- return R.error("搴撳瓨娌℃湁"+type+"绫诲瀷绌烘墭鐩�");
+ return R.error("搴撳瓨娌℃湁"+type+"绫诲瀷绌烘墭鐩樻垨鏃犲彲鐢ㄥ爢鍨涙満");
}
String locNo = locMast.getLocNo();
@@ -443,15 +768,12 @@
* 鍏ㄦ澘鍏ュ簱
*/
@Transactional(propagation = Propagation.REQUIRED)
- public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, WaitPakin waitPakins, int locArea,boolean tailSupportFlag) {
+ public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, WaitPakin waitPakins,boolean tailSupportFlag) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
-// List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
-// List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
-// FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(matnrs.get(0), batchs.get(0));
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(waitPakins);
- StartupDto dto = commonService.getLocNoNew( 1, devpNo,findLocNoAttributeVo, locArea);
+ StartupDto dto = commonService.getLocNoNew( 1, devpNo,findLocNoAttributeVo,waitPakins.getModel().equals("绌烘墭鐩�") ? 1 : 2);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -472,7 +794,7 @@
wrkMast.setEmptyMk("N"); // 绌烘澘
wrkMast.setLinkMis("Y");
wrkMast.setCtnType(tailSupportFlag ? 1 : 0); // 灏炬墭鏍囪瘑
- wrkMast.setPdcType(waitPakins.getModel()); // 绌烘《绫诲瀷
+ wrkMast.setPdcType(waitPakins.getMatnr()); // 绌烘《绫诲瀷
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
@@ -524,43 +846,30 @@
* 鐩翠緵缃愯绾�
*/
@Transactional(propagation = Propagation.REQUIRED)
- public StartupDto startupFullPutStore(SearchLocParam param,WaitPakin waitPakin) {
+ public StartupDto startupFullPutStore(SearchLocParam param,WaitPakin waitPakin,SearchLocParam.WantBucket wantBucket) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
- String model = waitPakin.getModel();
+// // 鍒ゆ柇绌烘《搴撴湁澶氬皯杩欑妗跺瀷
+// int count = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("matnr", param.getBucketType()).where("CAST(SUBSTRING(loc_no, 1, 2) as int) >= 9"));
+//
+// // 灏忎簬10涓垯鐩翠緵缃愯绾匡紝閬垮厤鍏ョ┖妗跺簱鍚庡湪鍑哄簱
+// if (count > 10) {
+// return null;
+// }
- Integer wantBucketFlag = 0; // 缃愯绾垮彿
- String wantBucketType; // 妗剁被鍨�
- boolean flag = true;
- for(Map.Entry<Integer,String> entry :param.getWantBucketFlag().entrySet()) {
- wantBucketFlag = entry.getKey();
- wantBucketType = entry.getValue();
- if(model.equals(wantBucketType)) { // 褰撳墠妗剁被鍨嬫槸缃愯绾胯鐨勭被鍨�
- // 绌烘《搴撴棤璇ョ被鍨嬫《
- int count = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("model", model).where("CAST(SUBSTRING(loc_no, 1, 2) as int) >= 9"));
- if (count == 0) {
- flag = false;
- break;
- }
- }
- }
- if (flag) { // 涓嶆弧瓒崇洿渚涚綈瑁呯嚎鏉′欢
- return null;
- }
-
- StartupDto dto = commonService.getLocNo(param,wantBucketFlag);
+ StartupDto dto = commonService.getLocNo(param,wantBucket.getSite());
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
wrkMast.setIoTime(now);
- wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
- wrkMast.setIoType(2); // 鍏ュ嚭搴撶姸鎬侊細2.鐩翠緵缃愯绾�
+ wrkMast.setWrkSts(2L);
+ wrkMast.setIoType(3); // 鍏ュ嚭搴撶姸鎬侊細3.绔欏埌绔�
wrkMast.setIoPri(13D); // 浼樺厛绾�
- wrkMast.setCrnNo(dto.getCrnNo());
+// wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
// wrkMast.setLocNo(dto.getLocNo());
@@ -571,7 +880,7 @@
wrkMast.setEmptyMk("N"); // 绌烘澘
wrkMast.setLinkMis("Y");
wrkMast.setCtnType(param.isTailSupportFlag() ? 1 : 0); // 灏炬墭鏍囪瘑
- wrkMast.setPdcType(model); // 绌烘《绫诲瀷
+ wrkMast.setPdcType(waitPakin.getMatnr()); // 绌烘《绫诲瀷
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
@@ -610,7 +919,7 @@
}
@Transactional
- public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode, int locArea) {
+ public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode, int locArea, int flag) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
@@ -624,7 +933,7 @@
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
wrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細10.绌烘澘鍏ュ簱
- wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setIoPri(14D); // 浼樺厛绾�
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
@@ -634,8 +943,9 @@
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("Y"); // 绌烘澘
wrkMast.setLinkMis("Y");
- wrkMast.setBarcode(barcode);
- wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
+ wrkMast.setPltType(flag); // 绌烘嫋绫诲瀷
+// wrkMast.setBarcode(barcode);
+// wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(new Date());
wrkMast.setModiTime(new Date());
--
Gitblit v1.9.1