From 6c8588d5f7f0de7e9489426c350472bf911a4933 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期五, 05 十二月 2025 15:47:07 +0800
Subject: [PATCH] towcs
---
src/main/java/com/zy/common/web/WcsController.java | 438 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 391 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index de97aac..d209e64 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -6,19 +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;
/**
@@ -43,13 +51,50 @@
private WaitPakinService waitPakinService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private BasCrnpService basCrnpService;
+ @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 R getLocNo(@RequestBody SearchLocParam param) {
- if (Cools.isEmpty(param.getIoType())) {
- return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
- }
+ @Transactional
+ public synchronized R getLocNo(@RequestBody(required = false) SearchLocParam param) {
+ WaitPakin waitPakin = new WaitPakin();
+ log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
+ //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("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
@@ -66,49 +111,101 @@
}
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()));
+ 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("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
+ return R.error(CodeRes.EXIST_500);
}
}
- if (Cools.isEmpty(param.getLocType1())){
+ if (Cools.isEmpty(param.getLocType1())) {
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
- // 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
- sourceStaNo.setLocType1(param.getLocType1());
- LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ LocTypeDto locTypeDto = new LocTypeDto();
+ locTypeDto.setLocType1(param.getLocType1());
StartupDto dto = null;
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
assert waitPakins != null;
- dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
+// dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
+ dto = startupFullPutStoreToWmsDev(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins,param.getRow());
break;
case 10://绌烘墭鐩樺叆搴�
- dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
+ dto = emptyPlateIn(param.getSourceStaNo(), param.getBarcode(),param.getRow());
break;
default:
break;
}
- log.info("/pakin/loc/v1:"+dto + "======鎵樼洏鐮�:"+param.getBarcode());
+ 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");
+ }
+ }
+ case "task_cancel":
+ workService.cancelWrkMast(notifyDto.getSuperTaskNo(), 9527L);
+ }
+ return R.ok();
+ }
/**
* 鍏ㄦ澘鍏ュ簱
*/
@Transactional
- public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
+ public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins,int[] row) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto,0);
- int workNo = dto.getWorkNo();
+// 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.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto, barcode);
+ if (dto == null) {
+ throw new CoolException("鎵句笉鍒扮┖搴撲綅");
+ }
+ int workNo = dto.getTaskNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -131,6 +228,8 @@
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
+ wrkMast.setModiUser(waitPakin1.getModiUser());
+ wrkMast.setAppeUser(waitPakin1.getAppeUser());
boolean res = wrkMastService.insert(wrkMast);
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
@@ -148,41 +247,216 @@
}
});
// 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
- Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
- .eq("zpallet", barcode);
- WaitPakin setParam = new WaitPakin();
- setParam.setIoStatus("Y");
- setParam.setModiTime(now);
- if (!waitPakinService.update(setParam, wrapper)) {
+ if (!waitPakinService.updateIoStatus("Y", dto.getLocNo(), barcode)) {
throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
}
// 鏇存柊婧愮珯鐐逛俊鎭�
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiTime(now);
- if (!basDevpService.updateById(sourceStaNo)){
+ if (!basDevpService.updateById(sourceStaNo)) {
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)){
+ if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(dto.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("鎷ｉ�夌洏鐐逛换鍔′笉瀛樺湪");
+ }
+
+ 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 StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
- // 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
+ public StartupDto emptyPlateIn(Integer devpNo, String barcode,int[] row) {
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0);
- int workNo = dto.getWorkNo();
+ Integer[] arr=arr();
+
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
+ LocTypeDto locTypeDto = new LocTypeDto();
+
+ // 妫�绱㈠簱浣�
+ StartupDto dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto, barcode);
+
+ String locNo = dto.getLocNo();
+
+ int workNo = commonService.getWorkNo(0);
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
@@ -190,17 +464,15 @@
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
wrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細10.绌烘澘鍏ュ簱
wrkMast.setIoPri(13D); // 浼樺厛绾�
- wrkMast.setCrnNo(dto.getCrnNo());
- wrkMast.setSourceStaNo(dto.getSourceStaNo());
- wrkMast.setStaNo(dto.getStaNo());
- wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setSourceStaNo(devpNo);
+ wrkMast.setLocNo(locNo);
wrkMast.setFullPlt("N"); // 婊℃澘
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("Y"); // 绌烘澘
wrkMast.setLinkMis("Y");
wrkMast.setBarcode(barcode);
- wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
+ wrkMast.setCtnType(2); // 瀹瑰櫒绫诲瀷
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(new Date());
wrkMast.setModiTime(new Date());
@@ -208,14 +480,8 @@
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
- // 鏇存柊婧愮珯鐐逛俊鎭�
- sourceStaNo.setWrkNo(workNo);
- sourceStaNo.setModiTime(new Date());
- if (!basDevpService.updateById(sourceStaNo)){
- throw new CoolException("鏇存柊婧愮珯澶辫触");
- }
// 鏇存柊鐩爣搴撲綅鐘舵��
- LocMast locMast = locMastService.selectById(dto.getLocNo());
+ LocMast locMast = locMastService.selectById(locNo);
if (locMast.getLocSts().equals("O")){
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(new Date());
@@ -223,9 +489,87 @@
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(locNo + "鐩爣搴撲綅宸茶鍗犵敤");
}
return dto;
}
+ @Transactional
+ public Integer[] arr() {
+ //鑾峰彇鏈夋爣璁扮殑灏忚溅锛屾寜椤哄簭杩涜璁板綍
+ int count =basCrnpService.selectCount(new EntityWrapper<BasCrnp>());
+ //鍒濆鍖栨暟缁�
+ Integer [] arr=new Integer[7];
+ //鏁扮粍鏍囪
+ int i=0;
+ BasCrnp basCrnp=basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("tank_qty",1));
+ //娌℃湁鎵惧埌鏍囪鏃舵寜榛樿涓�鍙峰皬杞︽墍鍦ㄥ眰寮�濮嬫帓
+ if(Cools.isEmpty(basCrnp)){
+ for(int q=1;q<=count;q++){
+ basCrnp=basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no",q));
+ if(Cools.isEmpty(basCrnp)){
+ log.error(q+"鍙峰皬杞︽病鏈夋壘鍒�");
+ continue;
+ }
+ if(basCrnp.getCrnErr()>0||basCrnp.getCrnSts()!=1){
+ log.error(q+"鍙峰皬杞︽姤璀︽垨鑰呭湪鍏呯數璺宠繃姝よ溅");
+ continue;
+ }
+ arr[i]=basCrnp.getLev1();
+ i++;
+ if(q==1){
+ basCrnp.setTankQty(0);
+ basCrnpService.update(basCrnp,new EntityWrapper<BasCrnp>().eq("crn_no",1));
+ }else if(q==2){
+ basCrnp.setTankQty(1);
+ basCrnpService.update(basCrnp,new EntityWrapper<BasCrnp>().eq("crn_no",2));
+ }
+ }
+ }else{
+ basCrnp.setTankQty(0);
+ basCrnpService.update(basCrnp,new EntityWrapper<BasCrnp>().eq("crn_no",basCrnp.getCrnNo()));
+ int xx=0;
+ arr[i]=basCrnp.getLev1();
+ i++;
+ int o=basCrnp.getCrnNo();
+ for(int q=1;q<count;q++){
+ if(++o>count){
+ o=1;
+ }
+ basCrnp=basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no",o));
+ if(Cools.isEmpty(basCrnp)){
+ log.error(q+"鍙峰皬杞︽病鏈夋壘鍒�");
+ continue;
+ }
+ if(basCrnp.getCrnErr()>0||basCrnp.getCrnSts()!=1){
+ log.error(q+"鍙峰皬杞︽姤璀︽垨鑰呭湪鍏呯數璺宠繃姝よ溅");
+ continue;
+ }
+ if(xx==0){
+ basCrnp.setTankQty(1);
+ basCrnpService.update(basCrnp,new EntityWrapper<BasCrnp>().eq("crn_no",o));
+ }
+ arr[i]=basCrnp.getLev1();
+ i++;
+ xx++;
+ }
+
+ }
+ for (int w=1;w<=7;w++){
+ boolean boo=true;
+ for(int g=0;g<i;g++){
+ if(arr[g]==w){
+ boo=false;
+ break;
+ }
+ }
+ if(boo){
+ arr[i]=w;
+ i++;
+ }
+ if(i==7) break;
+ }
+ return arr;
+ }
+
}
--
Gitblit v1.9.1