From d74e41701d48afe3e36dbec7f242765fc47096ea Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期五, 05 十二月 2025 16:47:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 553 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 371 insertions(+), 182 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 6f16d15..9def5c4 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -6,20 +6,27 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.entity.result.StorageResult;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.Utils;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
+import com.zy.common.web.param.NotifyDto;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -46,224 +53,410 @@
private LocDetlService locDetlService;
@Autowired
private BasCrnpService basCrnpService;
- @PostMapping("/pakin/loc/returnWarehouse")
- @ResponseBody
- public synchronized StorageResult returnWarehouse(@RequestBody(required = false) SearchLocParam param) {
- StorageResult storageResult=new StorageResult();
- if (Cools.isEmpty(param.getTaskNo())) {
- storageResult.setReturnStatus(1);
- storageResult.setErrorMessage("浼犲叆宸ヤ綔鍙蜂负绌�");
- return storageResult;
- }
- WrkMast wrkMast =wrkMastService.selectOne(new EntityWrapper<WrkMast>()
- .eq("wrk_no",param.getTaskNo())
- .in("io_type",103,107));
- if (Cools.isEmpty(wrkMast)){
- storageResult.setReturnStatus(1);
- storageResult.setErrorMessage("娌℃湁鎵惧埌鐩樼偣鎷ｆ枡浠诲姟---------"+param.getTaskNo());
- return storageResult;
- }
- SearchLocParam searchLocParam = new SearchLocParam();
- searchLocParam.setBoxNo(wrkMast.getBarcode());
- searchLocParam.setWcsIoType(1);//婊℃澘
- searchLocParam.setWcsSourceStaNo(wrkMast.getStaNo());
- searchLocParam.setWcsStatus(0);
- return getLocNo(searchLocParam);
+ @Autowired
+ private WorkService workService;
+
+ @Value("${led.ip}")
+ private String ledIp;
+ @Value("${led.port}")
+ private String ledPort;
+ @Value("${led.url}")
+ private String ledUrl;
+ @Value("${led.id}")
+ private String ledId;
+
+
+ @GetMapping("/getLedInfos")
+ public R getLedInfos(HttpServletRequest request) {
+// String remoteAddr = request.getRemoteAddr();
+ HashMap<String, String> map = new HashMap<>();
+ map.put("ledIp",ledIp);
+ map.put("ledPort",ledPort);
+ map.put("ledUrl",ledUrl);
+ map.put("ledId",ledId);
+ return R.ok(map);
}
@PostMapping("/pakin/loc/v1")
@ResponseBody
- public synchronized StorageResult getLocNo(@RequestBody(required = false) SearchLocParam param) {
- StorageResult storageResult=new StorageResult();
+ @Transactional
+ public synchronized R getLocNo(@RequestBody(required = false) SearchLocParam param) {
+ WaitPakin waitPakin = new WaitPakin();
log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
- if (Cools.isEmpty(param.getWcsIoType())) {
- storageResult.setReturnStatus(1);
- storageResult.setErrorMessage("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
- return storageResult;
+ //wcs璋冪敤姝ゆ帴鍙ｅ悜缁勬墭琛ㄦ彃鍏ヤ竴鏉℃暟鎹ā鎷熺粍鎵�
+ waitPakin.setZpallet(param.getBarcode());
+ waitPakin.setAnfme(100.0D);
+ waitPakin.setMatnr("50001LR-71");
+ waitPakin.setMaktx("姘旀场琚�");
+ waitPakin.setSpecs("50001LR-71");
+ waitPakin.setModel("skv");
+ waitPakinService.insert(waitPakin);
+// if (Cools.isEmpty(param.getIoType())) {
+// return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
+// }
+ if (Cools.isEmpty(param.getSourceStaNo())) {
+ return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getWcsSourceStaNo())) {
- storageResult.setReturnStatus(1);
- storageResult.setErrorMessage("婧愮珯缂栧彿涓嶈兘涓虹┖");
- return storageResult;
- }
- int ioType = 0;
List<WaitPakin> waitPakins = null;
- if (param.getWcsIoType() == 1) {
- //鎷ｆ枡鍜岀洏鐐瑰叆搴�
- WrkMast wrkMast1037 =wrkMastService.selectOne(new EntityWrapper<WrkMast>()
- .eq("barcode", param.getBoxNo())
- .in("io_type",103,107));
- WrkMast wrkMast537 =wrkMastService.selectOne(new EntityWrapper<WrkMast>()
- .eq("barcode", param.getBoxNo())
- .in("io_type",53,57));
- if (wrkMast537 != null) {
- StorageResult.Results results=new StorageResult.Results();
- results.setTaskNo(wrkMast537.getWrkNo());
- results.setShelfUnitId(wrkMast537.getLocNo()+"");
- storageResult.setResults(results);
- return storageResult;
+ if (param.getIoType() == 1) {
+ if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鏉＄爜涓嶈兘涓虹┖");
}
- if(Cools.isEmpty(wrkMast1037)) {
- if (Cools.isEmpty(param.getBoxNo())) {
- storageResult.setReturnStatus(1);
- storageResult.setErrorMessage("鏉＄爜涓嶈兘涓虹┖");
- return storageResult;
+ 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);
}
- waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBoxNo()));
- if (Cools.isEmpty(waitPakins)) {
- WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBoxNo());
- if (wrkMast != null && wrkMast.getIoType() == 103) {
- storageResult.setReturnStatus(1);
- storageResult.setErrorMessage(CodeRes.PICK_600);
- return storageResult;
- }
- storageResult.setReturnStatus(1);
- storageResult.setErrorMessage(CodeRes.NO_COMB_700);
- return storageResult;
- }
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBoxNo()));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBoxNo()));
- if (countLoc > 0 || countWrk > 0) {
- storageResult.setReturnStatus(1);
- storageResult.setErrorMessage(CodeRes.EXIST_500);
- return storageResult;
- }
- }else {
- ioType = wrkMast1037.getIoType();
+ 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("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
+ LocTypeDto locTypeDto = new LocTypeDto();
+ locTypeDto.setLocType1(param.getLocType1());
- switch (param.getWcsIoType()) {
+ StartupDto dto = null;
+ switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
assert waitPakins != null;
- storageResult = startupFullPutStore(param.getWcsSourceStaNo(), param.getBoxNo(), waitPakins,ioType);
+// dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
+ dto = startupFullPutStoreToWmsDev(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins,param.getRow());
break;
- case 2://绌烘墭鐩樺叆搴�
- storageResult = emptyPlateIn(param.getWcsSourceStaNo(), param.getBoxNo());
+ case 10://绌烘墭鐩樺叆搴�
+ dto = emptyPlateIn(param.getSourceStaNo(), param.getBarcode(),param.getRow());
break;
default:
break;
}
- log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", storageResult, param.getBoxNo());
- return storageResult;
+ log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
+ return R.ok().add(dto);
}
+ @PostMapping("/pakin/loc/returnWarehouse")
+ @ResponseBody
+ public synchronized R returnWarehouse(@RequestBody(required = false) SearchLocParam param) {
+ log.info("鏀跺埌WCS鎷ｉ�夌洏鐐瑰叆搴撴帴鍙ｈ姹�====>>鍏ュ弬:{}", param);
+ if (Cools.isEmpty(param.getSourceStaNo())) {
+ return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
+ }
+ LocTypeDto locTypeDto = new LocTypeDto();
+ locTypeDto.setLocType1(param.getLocType1());
+
+ StartupDto dto = startupPickIn(param.getSourceStaNo(), param.getBarcode(), locTypeDto,param.getRow());;
+ log.info("WCS鎷ｉ�夌洏鐐瑰叆搴撴帴鍙ｈ繑鍙�:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
+ return R.ok().add(dto);
+ }
+
+ @PostMapping("/taskWrk/state")
+ @ResponseBody
+ public R taskWrkState(@RequestBody(required = false) NotifyDto notifyDto){
+ log.info("鏀跺埌WCS璇锋眰涓婃姤鎺ュ彛======>>宸ヤ綔鍙�:{},鍏ュ弬:{}",notifyDto.getSuperTaskNo(),notifyDto);
+ if (Cools.isEmpty(notifyDto.getNotifyType())){
+ return R.error("閫氱煡绫诲瀷涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(notifyDto.getTaskNo())){
+ return R.error("浠诲姟鍙蜂笉鑳戒负绌�");
+ }
+ WrkMast wrkMast = new WrkMast();
+ switch (notifyDto.getMsgType()){
+ case "task_complete":
+ wrkMast = wrkMastService.selectByTaskNo(notifyDto.getSuperTaskNo());
+ if (wrkMast != null && (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 11)){
+ wrkMast.setWrkSts(4L);
+ if (!wrkMastService.updateById(wrkMast)){
+ return R.error("淇敼宸ヤ綔妗ｅけ璐�====>4");
+ }
+ }else if (wrkMast != null && (wrkMast.getIoType() == 101)){
+ wrkMast.setWrkSts(14L);
+ if (!wrkMastService.updateById(wrkMast)){
+ return R.error("淇敼宸ヤ綔妗ｅけ璐�====>14");
+ }
+ }
+ break;
+ case "task_cancel":
+ workService.cancelWrkMast(notifyDto.getSuperTaskNo(), 9527L);
+ }
+ return R.ok();
+ }
/**
* 鍏ㄦ澘鍏ュ簱
*/
@Transactional
- public StorageResult startupFullPutStore(Integer devpNo, String barcode, List<WaitPakin> waitPakins,Integer ioType) {
- StorageResult storageResult=new StorageResult();
- Integer[] arr=arr();
- LocMast locMast1=new LocMast();
- Integer workNo = 0;
- //鍒ゆ柇鏄惁鏄嫞鏂欐垨鑰呮槸鐩樼偣
- if(ioType==103||ioType==107) {
- WrkDetl wrkDetl=wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("zpallet", barcode));
+ public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins,int[] row) {
+ // 婧愮珯鐐圭姸鎬佹娴�
+ 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());
+ WaitPakin waitPakin1 = waitPakins.get(0);
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
+ findLocNoAttributeVo.setMatnr(waitPakin1.getMatnr());
- int type=Cools.isEmpty(wrkDetl.getBeBatch())?1:wrkDetl.getBeBatch();
- // 妫�绱㈠簱浣�
- WaitPakin waitPakin1=new WaitPakin();
- waitPakin1.sync(wrkDetl);
- locMast1 =commonService.getLocNo2(waitPakin1,arr,0,type,1);
-
- WrkMast wrkMast=wrkMastService.selectByBarcode(barcode);
- workNo = wrkMast.getWrkNo();
- int mbz=wrkMast.getStaNo()*10+Integer.valueOf(wrkMast.getSourceLocNo().substring(6));
- String ykw=wrkMast.getLocNo();
- wrkMast.setIoType(ioType-50);
- wrkMast.setWrkSts(1L);//鍏ュ簱
- wrkMast.setModiTime(new Date());
- wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 婧愮珯
- wrkMast.setStaNo(mbz); // 鐩爣绔�
- wrkMast.setLocNo(locMast1.getLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
- wrkMast.setSourceLocNo(ykw); // 婧愬簱浣�
- wrkMastService.updateById(wrkMast);
- }else{
- int type=Cools.isEmpty(waitPakins.get(0).getBeBatch())?1:waitPakins.get(0).getBeBatch();
- // 妫�绱㈠簱浣�
- locMast1 =commonService.getLocNo2(waitPakins.get(0),arr,0,type,1);
-
- //姝ｅ父鍏ュ簱
- workNo = commonService.getWorkNo(0);
- Date now = new Date();
- // 鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(new Date());
- wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
- wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
- wrkMast.setIoPri(13D); // 浼樺厛绾�
- wrkMast.setSourceStaNo(devpNo);
- wrkMast.setLocNo(locMast1.getLocNo());
- wrkMast.setBarcode(barcode); // 鎵樼洏鐮�
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setLinkMis("Y");
- wrkMast.setCtnType(1); // 瀹瑰櫒绫诲瀷
- // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast.setAppeTime(now);
- wrkMast.setModiTime(now);
- boolean res = wrkMastService.insert(wrkMast);
- if (!res) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ StartupDto dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto, barcode);
+ if (dto == null) {
+ throw new CoolException("鎵句笉鍒扮┖搴撲綅");
+ }
+ int workNo = dto.getTaskNo();
+ Date now = new Date();
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(new Date());
+ 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(barcode); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+ wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ wrkMast.setModiUser(waitPakin1.getModiUser());
+ wrkMast.setAppeUser(waitPakin1.getAppeUser());
+ 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("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
- // 鐢熸垚宸ヤ綔妗ｆ槑缁�
- 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("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
- }
- });
- // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
- Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
- .eq("zpallet", barcode);
- WaitPakin setParam = new WaitPakin();
- setParam.setLocNo(locMast1.getLocNo());
- setParam.setIoStatus("Y");
- setParam.setModiTime(now);
- if (!waitPakinService.update(setParam, wrapper)) {
- throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
- }
+ });
+ // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
+ if (!waitPakinService.updateIoStatus("Y", dto.getLocNo(), barcode)) {
+ throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
+ }
+ // 鏇存柊婧愮珯鐐逛俊鎭�
+ sourceStaNo.setWrkNo(workNo);
+ sourceStaNo.setModiTime(now);
+ if (!basDevpService.updateById(sourceStaNo)) {
+ throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
- LocMast locMast = locMastService.selectById(locMast1.getLocNo());
- if (locMast.getLocSts().equals("O")){
+ LocMast locMast = locMastService.selectById(dto.getLocNo());
+ if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
- locMast.setModiTime(new Date());
- if (!locMastService.updateById(locMast)){
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(locMast1.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
+ }
+ return dto;
+ }
+
+ /**
+ * 鍏ㄦ澘鍏ュ簱-wms-dev
+ */
+ @Transactional
+ public StartupDto startupFullPutStoreToWmsDev(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins,int[] row) {
+ // 婧愮珯鐐圭姸鎬佹娴�
+ 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());
+ WaitPakin waitPakin1 = waitPakins.get(0);
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
+ findLocNoAttributeVo.setMatnr(waitPakin1.getMatnr());
+
+ StartupDto dto = commonService.getLocNoToWmsDev(1, devpNo, findLocNoAttributeVo, locTypeDto, barcode,row);
+ if (dto == null) {
+ throw new CoolException("鎵句笉鍒扮┖搴撲綅");
+ }
+ int workNo = dto.getTaskNo();
+ Date now = new Date();
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(new Date());
+ 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(loc(dto.getLocNo()));
+ wrkMast.setBarcode(barcode); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+ wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ wrkMast.setModiUser(waitPakin1.getModiUser());
+ wrkMast.setAppeUser(waitPakin1.getAppeUser());
+ 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("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ });
+ // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
+ if (!waitPakinService.updateIoStatus("Y", dto.getLocNo(), barcode)) {
+ throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
+ }
+ // 鏇存柊婧愮珯鐐逛俊鎭�
+ sourceStaNo.setWrkNo(workNo);
+ sourceStaNo.setModiTime(now);
+ if (!basDevpService.updateById(sourceStaNo)) {
+ throw new CoolException("鏇存柊婧愮珯澶辫触");
+ }
+ // 鏇存柊鐩爣搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectById(loc(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() + "鐩爣搴撲綅宸茶鍗犵敤");
+ }
+ return dto;
+ }
+
+ public String loc(String locNo){
+ String[] split = locNo.split("-");
+ return Utils.getLocNo(Integer.parseInt(split[0]),Integer.parseInt(split[1]),Integer.parseInt(split[2]));
+ }
+
+ /**
+ * 鎷ｉ�夊叆搴�
+ */
+ @Transactional
+ public StartupDto startupPickIn(Integer devpNo, String barcode, LocTypeDto locTypeDto,int[] row) {
+ // 婧愮珯鐐圭姸鎬佹娴�
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
+
+ WrkMast wrkMastOut = wrkMastService.selectByBarcode(barcode);
+ if (wrkMastOut == null) {
+ throw new CoolException("鎷ｉ�夌洏鐐逛换鍔′笉瀛樺湪");
}
- StorageResult.Results results=new StorageResult.Results();
- results.setTaskNo(workNo);
- results.setShelfUnitId(locMast1.getLocNo());
- results.setBarcode(barcode);
- storageResult.setResults(results);
- return storageResult;
+ if (wrkMastOut.getIoType() != 103 || wrkMastOut.getIoType() != 107) {
+ throw new CoolException("浠诲姟绫诲瀷涓嶅睘浜庢嫞閫夈�佺洏鐐�");
+ }
+
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMastOut.getWrkNo());
+ if (wrkDetls.isEmpty()) {
+ throw new CoolException("鎷ｉ�夌洏鐐逛换鍔℃暟鎹笉瀛樺湪");
+ }
+
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
+ findLocNoAttributeVo.setMatnr(wrkDetls.get(0).getMatnr());
+
+ StartupDto dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto, barcode);
+ if (dto == null) {
+ throw new CoolException("鎵句笉鍒扮┖搴撲綅");
+ }
+
+ Date now = new Date();
+
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ int workNo = dto.getTaskNo();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
+ wrkMast.setIoType(wrkMastOut.getIoType() - 50); // 鍏ュ嚭搴撶姸鎬侊細53.鎷ｆ枡鍐嶅叆搴�
+ wrkMast.setIoPri(30D); // 浼樺厛绾�
+ wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setSourceStaNo(dto.getSourceStaNo());
+ wrkMast.setStaNo(dto.getStaNo());
+ wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setBarcode(barcode); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+ wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ boolean res = wrkMastService.insert(wrkMast);
+ if (!res) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+
+ wrkDetlService.updateWorkNo(wrkMastOut.getWrkNo(), workNo);
+
+ // 鍒犻櫎宸ヤ綔涓绘。
+ if (!wrkMastService.deleteById(wrkMastOut)) {
+ throw new CoolException("鍒犻櫎宸ヤ綔涓绘。澶辫触锛寃orkNo=" + wrkMastOut.getWrkNo());
+ }
+
+ // 鏇存柊婧愮珯鐐逛俊鎭�
+ sourceStaNo.setWrkNo(wrkMast.getWrkNo());
+ sourceStaNo.setModiTime(now);
+ if (!basDevpService.updateById(sourceStaNo)) {
+ 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() + "鐩爣搴撲綅宸茶鍗犵敤");
+ }
+ return dto;
}
@Transactional
- public StorageResult emptyPlateIn(Integer devpNo, String barcode) {
- StorageResult storageResult=new StorageResult();
+ public StartupDto emptyPlateIn(Integer devpNo, String barcode,int[] row) {
// 妫�绱㈠簱浣�
Integer[] arr=arr();
+
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
+ LocTypeDto locTypeDto = new LocTypeDto();
+
// 妫�绱㈠簱浣�
- LocMast locMast1 =commonService.getLocNo2(null,arr,0,1,2);
+ StartupDto dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto, barcode);
+
+ String locNo = dto.getLocNo();
+
int workNo = commonService.getWorkNo(0);
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -273,7 +466,7 @@
wrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細10.绌烘澘鍏ュ簱
wrkMast.setIoPri(13D); // 浼樺厛绾�
wrkMast.setSourceStaNo(devpNo);
- wrkMast.setLocNo(locMast1.getLocNo());
+ wrkMast.setLocNo(locNo);
wrkMast.setFullPlt("N"); // 婊℃澘
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
@@ -289,7 +482,7 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
- LocMast locMast = locMastService.selectById(locMast1.getLocNo());
+ LocMast locMast = locMastService.selectById(locNo);
if (locMast.getLocSts().equals("O")){
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(new Date());
@@ -297,13 +490,9 @@
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(locMast1.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(locNo + "鐩爣搴撲綅宸茶鍗犵敤");
}
- StorageResult.Results results=new StorageResult.Results();
- results.setTaskNo(workNo);
- results.setShelfUnitId(locMast1.getLocNo());
- storageResult.setResults(results);
- return storageResult;
+ return dto;
}
@Transactional
--
Gitblit v1.9.1