From 4e7c38ae990b82399eab275bd9d18079785eaa38 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 31 十月 2022 14:05:41 +0800
Subject: [PATCH] Merge branch 'bfasrs' of http://47.97.1.152:5880/r/zy-asrs into bfasrs
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 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 2a4df87..06a9b5e 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -355,14 +355,25 @@
}
// 淇敼璁㈠崟鏄庣粏
if (BaseController.isJSON(locDto.getOrderNo())) {
- OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
- if (orderDetl == null) {
- orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
+ 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 (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 (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
- throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
- }
- orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
} else {
// 璁㈠崟鍚堝苟鍑哄簱
List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
@@ -392,6 +403,39 @@
}
}
+ private String[] GetOrderNo(String orderNo){
+ String s1 = Recombination(orderNo, ",");
+ String s2 = Recombination(s1, "\"}");
+ String[] s3= s2.split("\"");
+ String[] s =new String[(s3.length-1)/3];
+ int i=0;
+ int j=0;
+ for (String ss:s3){
+ if (ss.equals("orderNo")){
+ s[i]=s3[j+2];
+ i++;
+ }
+ j++;
+ }
+ return s;
+ }
+ private String Recombination(String a,String b){
+ String[] d=a.split(b);
+ String c="";
+ if (b.equals(",")){
+ for (int i=0;i<d.length;i++){
+ if (i%2!=0){
+ c=c+d[i];
+ }
+ }
+ }else if(b.equals("\"}")){
+ for (int i=0;i<d.length-1;i++){
+ c=c+d[i];
+ }
+ }
+ return c;
+ }
+
@Override
@Transactional
public String emptyPlateIn(Integer devpNo, Long userId) {
--
Gitblit v1.9.1