From abeb3e2f140e3ebb1714b631a71b8e8fd0e956eb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 29 五月 2023 15:02:06 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OutController.java |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index e8d4259..add6ab0 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -33,7 +33,7 @@
     @Autowired
     private LocDetlService locDetlService;
     @Autowired
-    private LocMastService locMastService;
+    private PakoutService pakoutService;
     @Autowired
     private StaDescService staDescService;
     @Autowired
@@ -71,7 +71,7 @@
             for (LocDetl locDetl : locDetls) {
                 if (issued > 0) {
                     LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
-                            issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
+                            issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued,locDetl.getOwner(),locDetl.getPayment());
                     List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
 //                    LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
 //                            locDetl.getAnfme(), issued < locDetl.getAnfme()? issued : locDetl.getAnfme());
@@ -88,7 +88,7 @@
                 }
             }
             if (issued > 0) {
-                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,orderDetl.getOwner(),1);
 //                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), 0.0,issued);
                 locDto.setLack(Boolean.TRUE);
                 locDtos.add(locDto);
@@ -100,6 +100,11 @@
     @PostMapping("/out/pakout/auth")
     @ManagerAuth(memo = "璁㈠崟鍑哄簱")
     public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
+        List<LocDto> locDtos1 = locDtos;
+        R r = pakout2(locDtos1);
+        if (!r.equals(R.ok())){
+            return r;
+        }
         int[][] is=new int[locDtos.size()][2];
         for (int i=0;i<locDtos.size();i++){
             LocDto locDto=locDtos.get(locDtos.size()-1-i);
@@ -152,9 +157,7 @@
         return R.ok();
     }
 
-    @PostMapping("/out/pakout2/auth")
-    @ManagerAuth(memo = "鐢熸垚鎷ｈ揣鍗�")
-    public synchronized R pakout2(@RequestBody List<LocDto> locDtos) throws InterruptedException {
+    public synchronized R pakout2(List<LocDto> locDtos) throws InterruptedException {
         int[][] is = new int[locDtos.size()][2];
         List<String> matnrs=new ArrayList<>();
         for (int i = 0; i < locDtos.size(); i++) {
@@ -202,6 +205,7 @@
         if (Cools.isEmpty(locDtos)) {
             return R.error("骞冲簱鍙傛暟涓虹┖锛屾病鏈夌敓鎴愭嫞璐у崟");
         }
+        String uuid = String.valueOf(System.currentTimeMillis());
         boolean lack = true;
         for (LocDto locDto : locDtos) {
             if (!locDto.isLack()) {
@@ -214,10 +218,10 @@
         }
         for (LocDto locDto:locDtos){
             ManLocDetl manLocDetl = manLocDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch());
-            if (!Cools.isEmpty(manLocDetl) && !(locDto.getAnfme()>=manLocDetl.getAnfme())) {
+            if (!Cools.isEmpty(manLocDetl) && !(locDto.getAnfme()>manLocDetl.getAnfme())) {
                 manLocDetl.setStatus(0);
                 if (manLocDetlService.update(manLocDetl, new EntityWrapper<ManLocDetl>().eq("uuid", manLocDetl.getUuid()))) {
-                    if (addPakOUT(locDto).equals(R.ok())) {
+                    if (addPakOUT(locDto,uuid).equals(R.ok())) {
                         Order order = orderService.selectByNo(locDto.getOrderNo());
                         if (Cools.isEmpty(order)){
                             return R.error("鏌ヨ璁㈠崟澶辫触锛岃鑱旂郴绠＄悊鍛�"+locDto.getOrderNo());
@@ -240,18 +244,18 @@
                     }
                 }
             }else if (locDto.getLocNo().equals("绔嬪簱")){
-                addPakOUT(locDto).equals(R.ok());
+                addPakOUT(locDto,uuid).equals(R.ok());
             }
         }
         for (LocDto locDto:locDtos){
             if (locDto.getLocNo().equals("搴撳瓨涓嶈冻")){
-                addPakOUT(locDto).equals(R.ok());
+                addPakOUT(locDto,uuid).equals(R.ok());
             }
         }
         return R.ok();
     }
 
-    private R addPakOUT(LocDto locDto){
+    private R addPakOUT(LocDto locDto,String uuid){
         ManPakOut manPakOut=new ManPakOut();
         manPakOut.setWrkNo(locDto.getOrderNo()+"-"+System.currentTimeMillis());
         manPakOut.setWrkSts((long)1);
@@ -267,7 +271,7 @@
         manPakOut.setUpdateTime(new Date());
         manPakOut.setPayment(locDto.getPayment());
         manPakOut.setOwner(locDto.getOwner());
-        manPakOut.setUuid(String.valueOf(System.currentTimeMillis()));
+        manPakOut.setUuid(uuid);
         if (Cools.isEmpty(manPakOutService.selectOne(new EntityWrapper<ManPakOut>().eq("doc_num",locDto.getOrderNo())))){
             manPakOut.setName(locDto.getMaktx());
         }

--
Gitblit v1.9.1