From e466acffabd3cba968bd5c6cbc89de8c5eedb38a Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期日, 08 三月 2026 19:29:13 +0800
Subject: [PATCH] no message
---
license.lic | 0
src/main/java/com/zy/asrs/entity/param/CombParam.java | 3
src/main/java/com/zy/system/entity/license/LicenseCheckListener.java | 28 +-
src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java | 2
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 11
src/main/java/com/zy/asrs/controller/OpenController.java | 12 +
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 72 +++---
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 6
src/main/java/com/zy/asrs/service/OpenService.java | 8
src/main/resources/mapper/OrderDetlPakinMapper.xml | 19 -
src/main/resources/mapper/WrkDetlMapper.xml | 7
src/main/java/com/zy/asrs/entity/param/TvQueryParam.java | 22 ++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 3
src/main/java/com/zy/common/constant/MesConstant.java | 4
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 328 +++++++++++++++++++-------------
src/main/resources/application-dev.yml | 8
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 30 ++
src/main/resources/license.lic | 0
18 files changed, 343 insertions(+), 220 deletions(-)
diff --git a/license.lic b/license.lic
index 34644d8..ce8a587 100644
--- a/license.lic
+++ b/license.lic
Binary files differ
diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index 167e77e..a56dfcd 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -188,52 +188,48 @@
throw new CoolException("浠诲姟妗ｄ笉瀛樺湪锛侊紒");
}
log.info("浠诲姟鎵ц鍙傛暟鍥炲啓:{}", JSON.toJSONString(params));
- if (params.getNotifyType().equals("task")) {
- //浠诲姟
- if (params.getMsgType().equals("task_complete") || params.getMsgType().equals("station_out_task_run")) {
- if (mast.getIoType() == 1 || mast.getIoType() == 11 || mast.getIoType() == 10 || mast.getIoType() == 53 || mast.getIoType() == 54 || mast.getIoType() == 57) {
-
- mast.setWrkSts(4L);
- } else if (mast.getIoType() == 101 || mast.getIoType() == 110 || mast.getIoType() == 103 || mast.getIoType() == 104 || mast.getIoType() == 107) {
- //TODO 鎭㈠姝ｅ父鍚庯紝杩欓噷浠ｇ爜瑕佹敞閲婃帀
- if (mast.getIoType() == 103 || mast.getIoType() == 107) {
- List<WrkDetl> wrkDetls103 = wrkDetlService
- .selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
- if (wrkDetls103.isEmpty()) {
- throw new CoolException("鎷ｆ枡鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + mast.getWrkNo());
- }
- for (WrkDetl wrkDetl : wrkDetls103) {
- // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
+ if (params.getMsgType().equals("task_complete") || params.getMsgType().equals("station_out_task_run_complete") || params.getMsgType().equals("station_out_task_run")) {
+ if (mast.getIoType() == 1 || mast.getIoType() == 11 || mast.getIoType() == 10 || mast.getIoType() == 53 || mast.getIoType() == 54 || mast.getIoType() == 57) {
+ mast.setWrkSts(4L);
+ } else if (mast.getIoType() == 101 || mast.getIoType() == 110 || mast.getIoType() == 103 || mast.getIoType() == 104 || mast.getIoType() == 107) {
+ //TODO 鎭㈠姝ｅ父鍚庯紝杩欓噷浠ｇ爜瑕佹敞閲婃帀
+ if (mast.getIoType() == 103 || mast.getIoType() == 107) {
+ List<WrkDetl> wrkDetls103 = wrkDetlService
+ .selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
+ if (wrkDetls103.isEmpty()) {
+ throw new CoolException("鎷ｆ枡鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + mast.getWrkNo());
+ }
+ for (WrkDetl wrkDetl : wrkDetls103) {
+ // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
+ wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
+ wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+ if (orderDetlPakout == null) {
+ orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
wrkDetl.getStandby2(), wrkDetl.getStandby3(),
wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
- if (orderDetlPakout == null) {
- orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
- wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
- wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
- }
- if (!Cools.isEmpty(orderDetlPakout)) {
- if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(),
- wrkDetl.getMatnr(),
- orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
- wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(),
- wrkDetl.getAnfme())) {
- throw new CoolException("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + mast.getWrkNo());
- }
+ }
+ if (!Cools.isEmpty(orderDetlPakout)) {
+ if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(),
+ wrkDetl.getMatnr(),
+ orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
+ wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(),
+ wrkDetl.getAnfme())) {
+ throw new CoolException("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + mast.getWrkNo());
}
}
}
- mast.setWrkSts(14L);
}
- if (!wrkMastService.updateById(mast)) {
- throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
- } else if (params.getMsgType().equals("task_cancel")) {
- //todo 鍙栨秷浠诲姟
+ mast.setWrkSts(14L);
}
+ if (!wrkMastService.updateById(mast)) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ } else if (params.getMsgType().equals("task_cancel")) {
+ //todo 鍙栨秷浠诲姟
}
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 3875e7a..9fff8ad 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -13,6 +13,7 @@
import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -106,6 +107,17 @@
return R.ok();
}
+
+ @PostMapping("/queryTask")
+ @ApiOperation("浠诲姟鎵ц淇℃伅鏌ヨ")
+ public synchronized R queryTaskInfo(@RequestBody TvQueryParam param) {
+ if (Objects.isNull(param)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return openService.queryTaskInfo(param);
+
+ }
+
@PostMapping("/order/matSync/default/v1")
// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 33a5843..4f5b414 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -16,6 +16,8 @@
// 鎵樼洏鏉＄爜
private String barcode;
+ private String boxType1;
+
//绔欑偣
private String station;
@@ -46,6 +48,7 @@
private String standby1 = "";
private String standby2 = "";
private String standby3 = "";
+ private String suppCode = "";
private String boxType1 = "1";
private String boxType2 = "1";
diff --git a/src/main/java/com/zy/asrs/entity/param/TvQueryParam.java b/src/main/java/com/zy/asrs/entity/param/TvQueryParam.java
new file mode 100644
index 0000000..07b775a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/TvQueryParam.java
@@ -0,0 +1,22 @@
+package com.zy.asrs.entity.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(value = "TvQueryParam", description = "TV鏌ヨ鍙傛暟")
+public class TvQueryParam implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("浠诲姟鍙�")
+ private String taskNo;
+
+ @ApiModelProperty("浠诲姟绫诲瀷")
+ private String taskType;
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
index e10e894..5b2d5ec 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
@@ -16,7 +16,7 @@
int deleteItem(@Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch);
- int updateAnfme(@Param("anfme")Double anfme, @Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch);
+ int updateAnfme(@Param("anfme")Double anfme, @Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("suppCode")String suppCode);
List<WrkDetl> selectAndLogByOrderNo(String orderNo);
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index bf4767c..4709f20 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,5 +1,6 @@
package com.zy.asrs.service;
+import com.core.common.R;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
@@ -45,4 +46,11 @@
void syncMat(MatSyncParam param);
void adjustmentOrderCreate(OpenAdjustmentOrderParam param);
+
+ /**
+ * 鏌ヨ鎵ц浠诲姟淇℃伅
+ * @param param
+ * @return
+ */
+ R queryTaskInfo(TvQueryParam param);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index f2664f7..8b58225 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -36,6 +36,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -915,9 +916,9 @@
// todo 鐩樼偣璁板綍銆佷繚瀛樿皟鏁磋褰�
// 淇敼鏄庣粏
if (!wrkDetlService.updateAnfme(wrkDetl1.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(),
- wrkDetl.getBatch())) {
+ wrkDetl.getSuppCode())) {
throw new CoolException(wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�"
- + wrkDetl.getBatch() + "鎵瑰彿淇敼鏁伴噺澶辫触");
+ + wrkDetl.getSuppCode() + "鎵瑰彿淇敼鏁伴噺澶辫触");
}
}
iterator.remove();
@@ -929,7 +930,7 @@
// 鍒犻櫎鏄庣粏
for (WrkDetl wrkDetl : wrkDetls) {
// todo 鐩樼偣璁板綍銆佷繚瀛樿皟鏁磋褰�
- if (!wrkDetlService.updateAnfme(-1.0D, wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
+ if (!wrkDetlService.updateAnfme(-1.0D, wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getSuppCode())) {
throw new CoolException("鍒犻櫎" + wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�"
+ wrkDetl.getBatch() + "鎵瑰彿浠诲姟鏄庣粏澶辫触");
}
@@ -1423,7 +1424,7 @@
generateCacheOutTask(station, locCache, userId);
/**鐢熸垚绔嬪簱鍑哄簱浠诲姟*/
- // generateCRNOutTask(station, locCache, userId);
+ generateCRNOutTask(station, locCache, userId);
return R.ok();
}
@@ -1651,147 +1652,194 @@
if (Objects.isNull(param.getBarcode())) {
throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
}
-
if (Objects.isNull(param.getCombMats()) || param.getCombMats().isEmpty()) {
throw new CoolException("缁勬墭鏄庣粏涓嶈兘涓虹┖锛侊紒");
}
- // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode())
- .eq("io_status", "N")) > 0) {
- throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("wrk_sts", 14)
+ .eq("io_type", 104)
+ .eq("barcode", param.getBarcode()));
+ if (Objects.isNull(wrkMast)) {
+ throw new CoolException("浠诲姟妗ｄ俊鎭笉瀛樺湪锛侊紒");
}
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
- if (countWrk > 0 || countLoc > 0) {
- WrkMast wrkDetl = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
- if (!wrkDetl.getIoType().equals(TaskIOType.MERGE_OUT.type)) {
- throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
- }
- }
- int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
- if (countwait > 0) {
- throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
- }
-
- // 鐢熸垚鍏ュ簱閫氱煡妗�
- List<DetlDto> detlDtos = new ArrayList<>();
- param.getCombMats().forEach(elem -> {
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(),
- elem.getStandby2(), elem.getStandby3(),
- elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(), elem.getThreeCode());
- if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto one = DetlDto.findDto(detlDtos, detlDto);
- assert one != null;
- one.setAnfme(one.getAnfme() + detlDto.getAnfme());
- } else {
- detlDtos.add(detlDto);
- }
- });
- BasContainer container = basContainerService
- .selectOne(new EntityWrapper<BasContainer>().eq("barcode", param.getBarcode()));
- if (Objects.isNull(container)) {
- throw new CoolException("鏁版嵁閿欒锛氬鍣ㄧ爜涓嶅瓨鍦紒锛�");
- }
- if (container.getMixMax() < detlDtos.size()) {
- throw new CoolException("瓒呭嚭瀹瑰櫒鏈�澶ф贩瑁呮暟閲忥紝褰撳墠瀹瑰櫒鏈�澶ф暟閲忎负锛�" + container.getMixMax() + "!!");
- }
- List<Mat> tempMats = new ArrayList<>();
- for (DetlDto detlDto : detlDtos) {
- Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", detlDto.getMatnr())
- .eq("supp_code", detlDto.getStandby1()));
- tempMats.add(mat);
- }
- Set<Long> tagIds = tempMats.stream().map(Mat::getTagId).collect(Collectors.toSet());
- if (tagIds.size() > 1) {
- throw new CoolException("缁勬墭鐗╂枡绫诲瀷涓嶄竴鑷达紝鍙湁鐩稿悓鐨勭墿鏂欏垎绫绘墠鍙互缁勬墭锛侊紒");
- }
- // 杩樺彲浠ユ斁鍏ュ灏戠鐗╂枡
- Double suplus = container.getMixMax();
- Date now = new Date();
- for (DetlDto detlDto : detlDtos) {
- Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- // 鏈�澶氬彲鏀炬暟閲�
- Double singleMax = mat.getUpQty() * suplus;
- if (singleMax.compareTo(detlDto.getAnfme()) < 0) {
- throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟缁勬墭涓婇檺涓猴細" + mat.getUpQty() + ",褰撳墠鎬婚噺瓒呭嚭鎵樼洏瑁呰浇涓婇檺!!");
- }
- BigDecimal decimal = new BigDecimal(detlDto.getAnfme() / mat.getUpQty());
- // 褰撳墠鐗╂枡闇�瑕佸崰鐢ㄦ枡绠辨牸鏁�
- Integer curr = decimal.setScale(0, RoundingMode.CEILING).intValue();
- suplus = suplus - curr;
- if (suplus < 0) {
- throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + ", 瓒呭嚭褰撳墠鎵樼洏瑁呰浇涓婇檺锛侊紒");
- }
-
+ for (CombParam.CombMat combMat : param.getCombMats()) {
BasStationDetl stationDetl = basStationDetlService.selectOne(new EntityWrapper<BasStationDetl>()
.eq("zpallet", param.getCarBarcode())
- .eq("three_code", detlDto.getThreeCode()));
+ .eq("three_code", combMat.getThreeCode()));
if (Objects.isNull(stationDetl)) {
throw new CoolException("鏄庣粏鍐呭涓嶅瓨鍦紒锛�");
}
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
+ .eq("matnr", stationDetl.getMatnr())
+ .eq("wrk_no", wrkMast.getWrkNo())
+ .eq("suppCode", combMat.getSuppCode()));
- Double v = Math.round((stationDetl.getAnfme() - stationDetl.getWorkQty()) * 10000) / 10000.0;
- if (detlDto.getAnfme().compareTo(v) > 0) {
- throw new CoolException("缁勬墭涓婇檺涓猴細" + stationDetl.getAnfme() + ", 宸茬粍鎵橈細" + stationDetl.getWorkQty() + ", 杩樺彲缁勬墭锛�" + v);
- }
+ if (Objects.isNull(wrkDetl)) {
+ //TODO 鏂版彃鍏�
+ Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", stationDetl.getMatnr())
+ .eq("supp_code", combMat.getSuppCode()));
+ if (Objects.isNull(mat)) {
+ throw new CoolException("鐗╂枡鍩虹淇℃伅宸蹭笉瀛樺湪锛侊紒");
+ }
+ WrkDetl detl = new WrkDetl();
+ BeanUtils.copyProperties(stationDetl, detl);
+ detl.setAnfme(combMat.getAnfme());
+ detl.setBarcode(wrkMast.getBarcode());
+ detl.setBoxType1(combMat.getBoxType1());
+ detl.setStandby1(combMat.getSuppCode());
+ detl.setWrkNo(wrkMast.getWrkNo());
- WaitPakin waitPakin = new WaitPakin();
- BeanUtils.copyProperties(mat, waitPakin);
- waitPakin.setBatch(detlDto.getBatch());
- waitPakin.setType(param.getType());
- waitPakin.setZpallet(param.getBarcode());
- // 璁剧疆缁勬墭绫诲瀷
- waitPakin.setType(param.getType());
- waitPakin.setIoStatus("N");
- waitPakin.setAnfme(detlDto.getAnfme());
- waitPakin.setThreeCode(detlDto.getThreeCode());
- waitPakin.setStatus("Y");
- waitPakin.setSuppCode(detlDto.getStandby1());
- waitPakin.setStandby1(detlDto.getStandby1());
- waitPakin.setStandby2(detlDto.getStandby2());
- waitPakin.setStandby3(detlDto.getStandby3());
- waitPakin.setBoxType1(detlDto.getBoxType1());
- waitPakin.setBoxType2(detlDto.getBoxType2());
- waitPakin.setBoxType3(detlDto.getBoxType3());
- waitPakin.setAppeUser(userId);
- waitPakin.setAppeTime(now);
- waitPakin.setModiUser(userId);
- waitPakin.setModiTime(now);
- if (!waitPakinService.insert(waitPakin)) {
- throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
- }
-
- Double v1 = Math.round((stationDetl.getWorkQty() + detlDto.getAnfme()) * 10000) / 10000.0;
- stationDetl.setWorkQty(v1);
-
- if (!basStationDetlService.updateById(stationDetl)) {
- throw new CoolException("绔欑偣鏄庣粏淇敼澶辫触");
- }
-
- if (v1.compareTo(stationDetl.getAnfme()) >= 0) {
- if (!basStationDetlService.deleteById(stationDetl)) {
- throw new CoolException("鍘熷鏁版嵁绉婚櫎澶辫触锛�");
+ if (!wrkDetlService.insert(detl)) {
+ throw new CoolException("浠诲姟鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ } else {
+ double val = Math.round((combMat.getAnfme() + wrkDetl.getAnfme()) * 10000) / 10000.0;
+ if (!wrkDetlService.updateAnfme(val, wrkMast.getWrkNo(), wrkDetl.getMatnr(),
+ wrkDetl.getSuppCode())) {
+ throw new CoolException(wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�"
+ + wrkDetl.getBatch() + "鎵瑰彿淇敼鏁伴噺澶辫触");
}
}
- List<BasStationDetl> stas = basStationDetlService.selectList(new EntityWrapper<BasStationDetl>()
- .eq("dev_no", stationDetl.getDevNo()));
- if (Objects.isNull(stas) || stas.isEmpty()) {
- BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", stationDetl.getDevNo()));
- if (Objects.isNull(station)) {
- throw new CoolException("鏁版嵁閿欒锛岀珯鐐逛笉瀛樺湪锛侊紒");
- }
- station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
- station.setBarcode("");
- if (!basStationService.updateById(station)) {
- throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
- }
- }
}
+// // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+// if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode())
+// .eq("io_status", "N")) > 0) {
+// throw new CoolException(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 (countWrk > 0 || countLoc > 0) {
+// WrkMast wrkDetl = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
+// if (!wrkDetl.getIoType().equals(TaskIOType.MERGE_OUT.type)) {
+// throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+// }
+// }
+// int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+// if (countwait > 0) {
+// throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+// }
+//
+// // 鐢熸垚鍏ュ簱閫氱煡妗�
+// List<DetlDto> detlDtos = new ArrayList<>();
+// param.getCombMats().forEach(elem -> {
+// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(),
+// elem.getStandby2(), elem.getStandby3(),
+// elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(), elem.getThreeCode());
+// if (DetlDto.has(detlDtos, detlDto)) {
+// DetlDto one = DetlDto.findDto(detlDtos, detlDto);
+// assert one != null;
+// one.setAnfme(one.getAnfme() + detlDto.getAnfme());
+// } else {
+// detlDtos.add(detlDto);
+// }
+// });
+// BasContainer container = basContainerService
+// .selectOne(new EntityWrapper<BasContainer>().eq("barcode", param.getBarcode()));
+// if (Objects.isNull(container)) {
+// throw new CoolException("鏁版嵁閿欒锛氬鍣ㄧ爜涓嶅瓨鍦紒锛�");
+// }
+// if (container.getMixMax() < detlDtos.size()) {
+// throw new CoolException("瓒呭嚭瀹瑰櫒鏈�澶ф贩瑁呮暟閲忥紝褰撳墠瀹瑰櫒鏈�澶ф暟閲忎负锛�" + container.getMixMax() + "!!");
+// }
+// List<Mat> tempMats = new ArrayList<>();
+// for (DetlDto detlDto : detlDtos) {
+// Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", detlDto.getMatnr())
+// .eq("supp_code", detlDto.getStandby1()));
+// tempMats.add(mat);
+// }
+// Set<Long> tagIds = tempMats.stream().map(Mat::getTagId).collect(Collectors.toSet());
+// if (tagIds.size() > 1) {
+// throw new CoolException("缁勬墭鐗╂枡绫诲瀷涓嶄竴鑷达紝鍙湁鐩稿悓鐨勭墿鏂欏垎绫绘墠鍙互缁勬墭锛侊紒");
+// }
+// // 杩樺彲浠ユ斁鍏ュ灏戠鐗╂枡
+// Double suplus = container.getMixMax();
+// Date now = new Date();
+// for (DetlDto detlDto : detlDtos) {
+// Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+// if (Cools.isEmpty(mat)) {
+// throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+// }
+// // 鏈�澶氬彲鏀炬暟閲�
+// Double singleMax = mat.getUpQty() * suplus;
+// if (singleMax.compareTo(detlDto.getAnfme()) < 0) {
+// throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟缁勬墭涓婇檺涓猴細" + mat.getUpQty() + ",褰撳墠鎬婚噺瓒呭嚭鎵樼洏瑁呰浇涓婇檺!!");
+// }
+// BigDecimal decimal = new BigDecimal(detlDto.getAnfme() / mat.getUpQty());
+// // 褰撳墠鐗╂枡闇�瑕佸崰鐢ㄦ枡绠辨牸鏁�
+// Integer curr = decimal.setScale(0, RoundingMode.CEILING).intValue();
+// suplus = suplus - curr;
+// if (suplus < 0) {
+// throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + ", 瓒呭嚭褰撳墠鎵樼洏瑁呰浇涓婇檺锛侊紒");
+// }
+//
+// BasStationDetl stationDetl = basStationDetlService.selectOne(new EntityWrapper<BasStationDetl>()
+// .eq("zpallet", param.getCarBarcode())
+// .eq("three_code", detlDto.getThreeCode()));
+// if (Objects.isNull(stationDetl)) {
+// throw new CoolException("鏄庣粏鍐呭涓嶅瓨鍦紒锛�");
+// }
+//
+// Double v = Math.round((stationDetl.getAnfme() - stationDetl.getWorkQty()) * 10000) / 10000.0;
+// if (detlDto.getAnfme().compareTo(v) > 0) {
+// throw new CoolException("缁勬墭涓婇檺涓猴細" + stationDetl.getAnfme() + ", 宸茬粍鎵橈細" + stationDetl.getWorkQty() + ", 杩樺彲缁勬墭锛�" + v);
+// }
+//
+// WaitPakin waitPakin = new WaitPakin();
+// BeanUtils.copyProperties(mat, waitPakin);
+// waitPakin.setBatch(detlDto.getBatch());
+// waitPakin.setType(param.getType());
+// waitPakin.setZpallet(param.getBarcode());
+// // 璁剧疆缁勬墭绫诲瀷
+// waitPakin.setType(param.getType());
+// waitPakin.setIoStatus("N");
+// waitPakin.setAnfme(detlDto.getAnfme());
+// waitPakin.setThreeCode(detlDto.getThreeCode());
+// waitPakin.setStatus("Y");
+// waitPakin.setSuppCode(detlDto.getStandby1());
+// waitPakin.setStandby1(detlDto.getStandby1());
+// waitPakin.setStandby2(detlDto.getStandby2());
+// waitPakin.setStandby3(detlDto.getStandby3());
+// waitPakin.setBoxType1(detlDto.getBoxType1());
+// waitPakin.setBoxType2(detlDto.getBoxType2());
+// waitPakin.setBoxType3(detlDto.getBoxType3());
+// waitPakin.setAppeUser(userId);
+// waitPakin.setAppeTime(now);
+// waitPakin.setModiUser(userId);
+// waitPakin.setModiTime(now);
+// if (!waitPakinService.insert(waitPakin)) {
+// throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+// }
+//
+// Double v1 = Math.round((stationDetl.getWorkQty() + detlDto.getAnfme()) * 10000) / 10000.0;
+// stationDetl.setWorkQty(v1);
+//
+// if (!basStationDetlService.updateById(stationDetl)) {
+// throw new CoolException("绔欑偣鏄庣粏淇敼澶辫触");
+// }
+//
+// if (v1.compareTo(stationDetl.getAnfme()) >= 0) {
+// if (!basStationDetlService.deleteById(stationDetl)) {
+// throw new CoolException("鍘熷鏁版嵁绉婚櫎澶辫触锛�");
+// }
+// }
+//
+// List<BasStationDetl> stas = basStationDetlService.selectList(new EntityWrapper<BasStationDetl>()
+// .eq("dev_no", stationDetl.getDevNo()));
+// if (Objects.isNull(stas) || stas.isEmpty()) {
+// BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", stationDetl.getDevNo()));
+// if (Objects.isNull(station)) {
+// throw new CoolException("鏁版嵁閿欒锛岀珯鐐逛笉瀛樺湪锛侊紒");
+// }
+// station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
+// station.setBarcode("");
+// if (!basStationService.updateById(station)) {
+// throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
+// }
+// }
+// }
}
/**
@@ -2036,6 +2084,20 @@
if (!Objects.isNull(mast)) {
if (mast.getIoType().equals(TaskIOType.MERGE_OUT.type) || mast.getIoType().equals(TaskIOType.PICK_OUT.type) || mast.getIoType().equals(TaskIOType.CHECK_OUT.type)) {
int ioType = mast.getIoType() - 50;
+
+ List<WrkDetl> wrkDetls103 = wrkDetlService
+ .selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ if (wrkDetls103.isEmpty()) {
+ ioType = 10;
+ }
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()));
+ if (!Objects.isNull(locDetls) && !locDetls.isEmpty()) {
+ Double sum = wrkDetls103.stream().mapToDouble(WrkDetl::getAnfme).sum();
+ Double summed = locDetls.stream().mapToDouble(LocDetl::getAnfme).sum();
+ if (summed.compareTo(sum) <= 0) {
+ ioType = 10;
+ }
+ }
mast.setIoType(ioType);
mast.setWrkSts(2L);
mast.setSourceStaNo(mast.getSourceStaNo());
@@ -2333,9 +2395,9 @@
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
if (Cools.isEmpty(wrkMast1)) {
- Integer outSta = devp.getDevNo();
+// Integer outSta = devp.getDevNo();
// 鑾峰彇璺緞
- StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
+// StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -2345,8 +2407,8 @@
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶被鍨�
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
wrkMast.setCrnNo(locMast.getCrnNo());
- wrkMast.setSourceStaNo(staDesc.getCrnStn() + ""); // 婧愮珯
- wrkMast.setStaNo(staDesc.getStnNo() + ""); // 鐩爣绔�
+// wrkMast.setSourceStaNo(staDesc.getCrnStn() + ""); // 婧愮珯
+// wrkMast.setStaNo(staDesc.getStnNo() + ""); // 鐩爣绔�
wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
//灏忔澗椤圭洰锛岀紦瀛樺嚭搴揂GV绔欑偣锛岀敤浜庢竻绌虹紦瀛樺尯搴撳瓨
wrkMast.setPauseMk(station.getDevNo());
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 2b7dac5..b779694 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -24,9 +24,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2022/4/9
@@ -57,6 +55,10 @@
private CheckOrderDetlService checkOrderDetlService;
@Autowired
private CheckOrderService checkOrderService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
@Override
@Transactional
@@ -655,7 +657,29 @@
throw new CoolException("淇濆瓨璋冩暣鍗曟槑缁嗗け璐�");
}
}
+ }
+ /**
+ * 鏌ヨ浠诲姟妗ｄ俊鎭�
+ * @param param
+ * @return
+ */
+ @Override
+ public R queryTaskInfo(TvQueryParam param) {
+ if (param.getTaskNo().equals("agv")) {
+ return R.ok();
+ } else {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getTaskNo()));
+ if (Objects.isNull(wrkMast)) {
+ throw new CoolException("浠诲姟淇℃伅涓嶅瓨鍦紒锛�");
+ }
+ List<WrkDetl> detls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+
+
+ Map<String, Object> wrkast = new HashMap<>();
+ wrkast.put("wrkDetls", detls);
+ return R.ok().add(wrkast);
+ }
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 112e50a..ae8e6bd 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -418,7 +418,8 @@
String orderNo = taskDto.getLocDtos().get(0).getOrderNo();
// OrderPakout orderPakout = orderPakOutService.selectByNo(orderNo);
- int ioType = (taskDto.isAll() ? 101 : 103);
+// int ioType = (taskDto.isAll() ? 101 : 103);
+ int ioType = 103;
if (ioType == 101) {
boolean DiffQty = taskDto.getLocDtos().stream().allMatch(locDto ->
locDetlService.selectOne(new EntityWrapper<LocDetl>()
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 3eaaa7a..1808981 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -57,11 +57,11 @@
}
@Override
- public boolean updateAnfme(Double anfme, Integer wrkNo, String matnr, String batch) {
+ public boolean updateAnfme(Double anfme, Integer wrkNo, String matnr, String suppCode) {
if (anfme <= 0) {
- return this.baseMapper.deleteItem(wrkNo, matnr, batch) > 0;
+ return this.baseMapper.deleteItem(wrkNo, matnr, suppCode) > 0;
} else {
- return baseMapper.updateAnfme(anfme, wrkNo, matnr, batch) > 0;
+ return baseMapper.updateAnfme(anfme, wrkNo, matnr, suppCode) > 0;
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 70a77b0..5a7dd25 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -406,7 +406,6 @@
} catch (Exception ignore) {
}
-
}
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
@@ -630,7 +629,7 @@
}
}
break;
-// case 103:
+ case 103:
// List<WrkDetl> wrkDetls103 = wrkDetlService
// .selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
// if (wrkDetls103.isEmpty()) {
@@ -639,7 +638,7 @@
// return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo="
// + wrkMast.getSourceLocNo() + "]");
// }
-//
+
// for (WrkDetl wrkDetl : wrkDetls103) {
// // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
// OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
@@ -669,7 +668,7 @@
// log.error(ignore.getMessage());
// }
// }
-// break;
+ break;
// 骞舵澘閫斾腑鎹℃枡
case 108:
// 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
@@ -923,7 +922,9 @@
station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
}
station.setBarcode("");
- basStationService.updateById(station);
+ if (!basStationService.updateById(station)) {
+ basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("dev_no", station.getDevNo()));
+ }
}
}
diff --git a/src/main/java/com/zy/common/constant/MesConstant.java b/src/main/java/com/zy/common/constant/MesConstant.java
index e2f8108..bbc7967 100644
--- a/src/main/java/com/zy/common/constant/MesConstant.java
+++ b/src/main/java/com/zy/common/constant/MesConstant.java
@@ -13,9 +13,9 @@
public static final String AGV_URL = "http://192.168.238.202/rcs/rtas/api/robot/controller";
//WCS绯荤粺鎺ュ彛鍦板潃
-// public static final String WCS_URL = "http://192.168.238.32:9090/wcs";
+ public static final String WCS_URL = "http://192.168.238.32:9090/wcs";
- public static final String WCS_URL = "http://192.168.238.31:9090/wcs";
+// public static final String WCS_URL = "http://192.168.238.31:9090/wcs";
//涓婃灦娲惧伐鍗曞弽棣�
public static final String IN_DISPATCH_RESULT = "getInDispatchResult";
diff --git a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
index 66234c2..72694f9 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
@@ -90,23 +90,23 @@
logger.info("++++++++ 璁稿彲璇佸姞杞芥爣璁帮紝鎼滅储淇敼 ++++++++");
licenseTimer.setSystemSupport(true);
-// licenseTimer.setLicenseDays(9999);
-// return true;
+ licenseTimer.setLicenseDays(9999);
+ return true;
- licenseTimer.setSystemSupport(install!=null);
-
- if (install != null) {
- Date start = new Date();
- Date end = install.getNotAfter();
- Long starTime = start.getTime();
- Long endTime = end.getTime();
- Long num = endTime - starTime;//鏃堕棿鎴崇浉宸殑姣鏁�
- int day = (int) (num / 24 / 60 / 60 / 1000);
- licenseTimer.setLicenseDays(day);
- }
+// licenseTimer.setSystemSupport(install!=null);
+//
+// if (install != null) {
+// Date start = new Date();
+// Date end = install.getNotAfter();
+// Long starTime = start.getTime();
+// Long endTime = end.getTime();
+// Long num = endTime - starTime;//鏃堕棿鎴崇浉宸殑姣鏁�
+// int day = (int) (num / 24 / 60 / 60 / 1000);
+// licenseTimer.setLicenseDays(day);
+// }
- return install != null;
+// return install != null;
} catch (Exception e) {
return false;
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fcb6c2b..afc91f9 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -12,7 +12,7 @@
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
username: sa
password: sa@123
- url: jdbc:sqlserver://192.168.238.31:1433;databasename=jsxsasrs
+ url: jdbc:sqlserver://192.168.238.32:1433;databasename=jsxsasrs
# url: jdbc:sqlserver://192.168.4.34:1433;databasename=jsxsasrs
mvc:
static-path-pattern: /**
@@ -48,7 +48,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: jsxsasrs
+ subject: jsxswms
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
@@ -114,8 +114,8 @@
#KOPEN灏忔澗骞冲彴
kopen:
-# url: webservice.kopen.com.cn
- url: 10.143.23.26
+ url: webservice.kopen.com.cn
+# url: 10.143.23.26
port: 1482
prefix: /kc-api/api/wms
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index 34644d8..ce8a587 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/resources/mapper/OrderDetlPakinMapper.xml b/src/main/resources/mapper/OrderDetlPakinMapper.xml
index 18adfaf..09cb98f 100644
--- a/src/main/resources/mapper/OrderDetlPakinMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakinMapper.xml
@@ -57,14 +57,14 @@
</resultMap>
<sql id="standbyAll">
- <choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
- </when>
- <otherwise>
- and (batch IS NULL OR batch = '')
- </otherwise>
- </choose>
+<!-- <choose>-->
+<!-- <when test="batch != null and batch != ''">-->
+<!-- and batch = #{batch}-->
+<!-- </when>-->
+<!-- <otherwise>-->
+<!-- and (batch IS NULL OR batch = '')-->
+<!-- </otherwise>-->
+<!-- </choose>-->
<!-- <choose>-->
<!-- <when test="brand != null and brand != ''">-->
<!-- and brand = #{brand}-->
@@ -77,9 +77,6 @@
<when test="standby1 != null and standby1 != ''">
and standby1 = #{standby1}
</when>
- <otherwise>
- and (standby1 IS NULL OR standby1 = '')
- </otherwise>
</choose>
<!-- <choose>-->
<!-- <when test="standby2 != null and standby2 != ''">-->
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 2d7e421..bc7bfd1 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -55,12 +55,9 @@
<sql id="batchSeq">
<choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
+ <when test="suppCode != null and suppCode != ''">
+ and supp_code = #{suppCode}
</when>
- <otherwise>
- and (batch IS NULL OR batch = '')
- </otherwise>
</choose>
</sql>
--
Gitblit v1.9.1