From 835a4d179d4e3fcecc7e2a8cd63e6698bb3f16c4 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 31 三月 2025 16:54:27 +0800
Subject: [PATCH] wcs电视机代码移植
---
src/main/java/com/zy/common/web/WcsController.java | 439 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 306 insertions(+), 133 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 5cf56ac..7ca162d 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -1,11 +1,14 @@
package com.zy.common.web;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.result.StorageResult;
import com.zy.asrs.service.*;
+import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
@@ -41,53 +44,111 @@
private WaitPakinService waitPakinService;
@Autowired
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);
+ }
+
@PostMapping("/pakin/loc/v1")
@ResponseBody
- public synchronized R getLocNo(@RequestBody SearchLocParam param) {
- if (Cools.isEmpty(param.getIoType())) {
- return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
+ public synchronized StorageResult getLocNo(@RequestBody(required = false) SearchLocParam param) {
+ StorageResult storageResult=new StorageResult();
+ log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
+ if (Cools.isEmpty(param.getWcsIoType())) {
+ storageResult.setReturnStatus(1);
+ storageResult.setErrorMessage("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
+ return storageResult;
}
- 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.getIoType() == 1) {
- if (Cools.isEmpty(param.getBarcode())) {
- return R.error("鏉＄爜涓嶈兘涓虹┖");
+ 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;
}
- waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("barcode", param.getBarcode()));
- if (Cools.isEmpty(waitPakins)) {
- 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.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();
}
- 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("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
- }
- }
- if (Cools.isEmpty(param.getLocType1())){
- return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
+
}
- // 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
- LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
- StartupDto dto = null;
- switch (param.getIoType()) {
+ switch (param.getWcsIoType()) {
case 1://婊℃墭鐩樺叆搴�
assert waitPakins != null;
- dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
+ storageResult = startupFullPutStore(param.getWcsSourceStaNo(), param.getBoxNo(), waitPakins,ioType);
break;
- case 10://绌烘墭鐩樺叆搴�
- dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
+ case 2://绌烘墭鐩樺叆搴�
+ storageResult = emptyPlateIn(param.getWcsSourceStaNo(), param.getBoxNo());
break;
default:
break;
}
-
- return R.ok().add(dto);
+ log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", storageResult, param.getBoxNo());
+ return storageResult;
}
@@ -95,111 +156,90 @@
* 鍏ㄦ澘鍏ュ簱
*/
@Transactional
- public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
- // 婧愮珯鐐圭姸鎬佹娴�
- 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();
- 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);
- 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("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
- }
- });
- // 鏇存柊婧愮珯鐐逛俊鎭�
- sourceStaNo.setWrkNo(workNo);
- 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;
- }
+ 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));
- @Transactional
- public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
- // 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
- // 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0);
- int workNo = dto.getWorkNo();
- // 鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(new Date());
- 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.setFullPlt("N"); // 婊℃澘
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("Y"); // 绌烘澘
- wrkMast.setLinkMis("Y");
- wrkMast.setBarcode(barcode);
- wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
- // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast.setAppeTime(new Date());
- wrkMast.setModiTime(new Date());
- boolean res = wrkMastService.insert(wrkMast);
- if (!res) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
- // 鏇存柊婧愮珯鐐逛俊鎭�
- sourceStaNo.setWrkNo(workNo);
- sourceStaNo.setModiTime(new Date());
- if (!basDevpService.updateById(sourceStaNo)){
- throw new CoolException("鏇存柊婧愮珯澶辫触");
+ 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);
+ int mbz=devpNo*10+Integer.valueOf(locMast1.getLocNo().substring(6));
+ //姝ｅ父鍏ュ簱
+ 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.setStaNo(mbz);
+ 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("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ 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("鏇存柊閫氱煡妗ｅけ璐�");
+ }
}
// 鏇存柊鐩爣搴撲綅鐘舵��
- LocMast locMast = locMastService.selectById(dto.getLocNo());
+ LocMast locMast = locMastService.selectById(locMast1.getLocNo());
if (locMast.getLocSts().equals("O")){
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(new Date());
@@ -207,9 +247,142 @@
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(locMast1.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
}
- return dto;
+
+ StorageResult.Results results=new StorageResult.Results();
+ results.setTaskNo(workNo);
+ results.setShelfUnitId(locMast1.getLocNo());
+ results.setBarcode(barcode);
+ storageResult.setResults(results);
+ return storageResult;
+ }
+
+ @Transactional
+ public StorageResult emptyPlateIn(Integer devpNo, String barcode) {
+ StorageResult storageResult=new StorageResult();
+ // 妫�绱㈠簱浣�
+ Integer[] arr=arr();
+ // 妫�绱㈠簱浣�
+ LocMast locMast1 =commonService.getLocNo2(null,arr,0,1,2);
+ int workNo = commonService.getWorkNo(0);
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(new Date());
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
+ wrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細10.绌烘澘鍏ュ簱
+ wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setSourceStaNo(devpNo);
+ wrkMast.setLocNo(locMast1.getLocNo());
+ wrkMast.setFullPlt("N"); // 婊℃澘
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("Y"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+ wrkMast.setBarcode(barcode);
+ wrkMast.setCtnType(2); // 瀹瑰櫒绫诲瀷
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(new Date());
+ wrkMast.setModiTime(new Date());
+ boolean res = wrkMastService.insert(wrkMast);
+ if (!res) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ // 鏇存柊鐩爣搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectById(locMast1.getLocNo());
+ if (locMast.getLocSts().equals("O")){
+ locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+ locMast.setModiTime(new Date());
+ if (!locMastService.updateById(locMast)){
+ throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException(locMast1.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ }
+ StorageResult.Results results=new StorageResult.Results();
+ results.setTaskNo(workNo);
+ results.setShelfUnitId(locMast1.getLocNo());
+ storageResult.setResults(results);
+ return storageResult;
+ }
+
+ @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