From 94dba00dbc6f351f5835d6f4a98d3126cedd9e80 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 01 十一月 2022 17:05:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 98 +++++++++++++++++++++++++++++++------------------
1 files changed, 62 insertions(+), 36 deletions(-)
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 7684bf2..88c59d7 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -103,7 +103,6 @@
Double ioPri = wrkMastService.getIoPri(1, dto.getLocNo());
wrkMast.setIoPri(ioPri); // 浼樺厛绾э細13
wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), true) ? 1 : 0);
- ;
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
@@ -236,7 +235,6 @@
Double ioPri = wrkMastService.getIoPri(ioType, dto.getLocNo());
wrkMast.setIoPri(ioPri); // 浼樺厛绾э細13
wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), false) ? 1 : 0);
- ;
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
@@ -316,7 +314,6 @@
Double ioPri = wrkMastService.getIoPri(ioType, taskDto.getLocNo());
wrkMast.setIoPri(ioPri); // 浼樺厛绾э細13
wrkMast.setOutMost(locMastService.isOutMost(taskDto.getLocNo(), false) ? 1 : 0);
- ;
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
@@ -363,21 +360,32 @@
// 淇敼璁㈠崟鏄庣粏
if (BaseController.isJSON(locDto.getOrderNo())) {
String[] orderNos = GetOrderNo(locDto.getOrderNo());
- Double anfme = locDto.getAnfme();
- for (String orderNo : orderNos) {
- OrderDetl orderDetl = orderDetlService.selectItem(orderNo, locDto.getMatnr(), locDto.getBatch());
- if (orderDetl == null) {
- orderDetl = orderDetlService.selectItem(orderNo, locDto.getMatnr(), null);
+ if (!Cools.isEmpty(orderNos)){
+ Double anfme = locDto.getAnfme();
+ for (String orderNo : orderNos) {
+ OrderDetl orderDetl = orderDetlService.selectItem(orderNo, locDto.getMatnr(), locDto.getBatch());
+ if (orderDetl == null) {
+ orderDetl = orderDetlService.selectItem(orderNo, locDto.getMatnr(), null);
+ }
+ if (orderDetl.getAnfme() <= anfme) {
+ if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getAnfme())) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
+ }
+ anfme = anfme - orderDetl.getAnfme();
+ } else {
+ if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), anfme)) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
+ }
+ }
+ orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
}
- if (orderDetl.getAnfme() <= anfme) {
- if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getAnfme())) {
- throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
- }
- anfme = anfme - orderDetl.getAnfme();
- } else {
- if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), anfme)) {
- throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
- }
+ }else {
+ OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
+ if (orderDetl == null) {
+ orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
+ }
+ if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
}
orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
}
@@ -413,14 +421,18 @@
private String[] GetOrderNo(String orderNo) {
String[] s3 = orderNo.split("\"");
String[] s = new String[(s3.length - 1) / 6];
- int i = 0;
- int j = 0;
- for (String ss : s3) {
- if (ss.equals("orderNo")) {
- s[i] = s3[j + 2];
- i++;
+ if (!Cools.isEmpty(s3)){
+ int i = 0;
+ int j = 0;
+ for (String ss : s3) {
+ if (ss.equals("orderNo")) {
+ s[i] = s3[j + 2];
+ i++;
+ }
+ j++;
}
- j++;
+ }else {
+ s=null;
}
return s;
}
@@ -460,7 +472,6 @@
Double ioPri = wrkMastService.getIoPri(10, dto.getLocNo());
wrkMast.setIoPri(ioPri); // 浼樺厛绾э細10
wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), true) ? 1 : 0);
- ;
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
@@ -547,7 +558,6 @@
wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔�
wrkMast.setOutMost(locMastService.isOutMost(locNo, false) ? 1 : 0);
- ;
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceLocNo(locNo); // 婧愬簱浣�
wrkMast.setFullPlt("N"); // 婊℃澘锛歒
@@ -625,7 +635,6 @@
wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
wrkMast.setIoPri(10D);
wrkMast.setOutMost(locMastService.isOutMost(locNo, false) ? 1 : 0);
- ;
wrkMast.setCrnNo(sourceLoc.getCrnNo());
wrkMast.setSourceLocNo(sourceLocNo); // 婧愬簱浣�
wrkMast.setLocNo(locNo); // 鐩爣搴撲綅
@@ -890,15 +899,33 @@
// 璁㈠崟鍏宠仈
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
for (WrkDetl wrkDetl : wrkDetls) {
- String[] orderNos = GetOrderNo(wrkDetl.getOrderNo());
- String[] anfmes = GetAnfme(wrkDetl.getOrderNo());
- int i = 0;
- for (String orderNo : orderNos) {
- if (!Cools.isEmpty(orderNo)) {
- Double anfme = Integer.parseInt(anfmes[i]) + 0.0;
- i++;
+ if (!Cools.isEmpty(wrkDetl.getOrderNo())){
+ String[] orderNos = GetOrderNo(wrkDetl.getOrderNo());
+ if (!Cools.isEmpty(orderNos)){
+ String[] anfmes = GetAnfme(wrkDetl.getOrderNo());
+ int i = 0;
+ for (String orderNo : orderNos) {
+ if (!Cools.isEmpty(orderNo)) {
+ Double anfme = Integer.parseInt(anfmes[i]) + 0.0;
+ i++;
+ if (BaseController.isJSON(wrkDetl.getOrderNo())) {
+ if (!orderDetlService.decrease(orderNo, wrkDetl.getMatnr(), wrkDetl.getBatch(), anfme)) {
+ throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
+ }
+ } else {
+ // 璁㈠崟鍚堝苟鍑哄簱
+ List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
+ for (OrderDto orderDto : orderDtoList) {
+ if (!orderDetlService.decrease(orderDto.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), orderDto.getAnfme())) {
+ throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
+ }
+ }
+ }
+ }
+ }
+ }else {
if (BaseController.isJSON(wrkDetl.getOrderNo())) {
- if (!orderDetlService.decrease(orderNo, wrkDetl.getMatnr(), wrkDetl.getBatch(), anfme)) {
+ if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
}
} else {
@@ -1088,7 +1115,6 @@
wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
wrkMast.setIoPri(15D);
wrkMast.setOutMost(locMastService.isOutMost(loc.getLocNo(), false) ? 1 : 0);
- ;
wrkMast.setCrnNo(sourceLoc.getCrnNo());
wrkMast.setSourceLocNo(sourceLocNo); // 婧愬簱浣�
wrkMast.setLocNo(loc.getLocNo()); // 鐩爣搴撲綅
--
Gitblit v1.9.1