From 2f97b2686649d2e2e9b7584c7b9cf39a276569d9 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 16 六月 2025 15:35:20 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   62 ++++++++++++++++++++++++++++++-
 1 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 8cc990a..effe8ca 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -13,6 +13,7 @@
 import com.zy.asrs.entity.result.MobileAdjustResult;
 import com.zy.asrs.mapper.ManLocDetlMapper;
 import com.zy.asrs.service.*;
+import com.zy.asrs.utils.MathUtils;
 import com.zy.asrs.utils.OrderInAndOutUtil;
 import com.zy.common.model.WrkDto;
 import com.zy.common.utils.Synchro;
@@ -58,6 +59,8 @@
     private ManLocDetlMapper manLocDetlMapper;
     @Autowired
     private WrkDetlLogService wrkDetlLogService;
+    @Autowired
+    private WrkMastLogService wrkMastLogService;
 
     @Autowired
     private MatService matService;
@@ -68,6 +71,9 @@
 
     @Resource
     private StaDescService staDescService;
+
+    @Autowired
+    private OrderDetlPakinService orderDetlPakinService;
 
     @RequestMapping("/pda/WarehouseOut/v1")
     @ManagerAuth(memo = "骞舵澘閫斾腑鎷ｆ枡-鍙傝�冨康鍒�")
@@ -209,10 +215,10 @@
                         Synchro.Copy(orderDetl, combMat);
                         combMat.setMatnr(orderDetl.getMatnr());
                         combMat.setBatch(orderDetl.getBatch());
-                        combMat.setAnfme(orderDetl.getAnfme() - orderDetl.getWorkQty());
+                        combMat.setAnfme(MathUtils.subtract(orderDetl.getAnfme(), orderDetl.getWorkQty()));
                         combMat.setMaktx(orderDetl.getMaktx());
                         combMat.setSpecs(orderDetl.getSpecs());
-                        combMat.setEnableQty(orderDetl.getAnfme() - orderDetl.getWorkQty());
+                        combMat.setEnableQty(MathUtils.subtract(orderDetl.getAnfme(), orderDetl.getWorkQty()));
                         combMats.add(combMat);
                     }
                     combParam.setCombMats(combMats);
@@ -240,11 +246,19 @@
         Mat mat = matService.selectByMatnr(nccJcQilibcBarcodeflowWms.getWlbm());
         MatParam matParam = new MatParam();
         Synchro.Copy(mat, matParam);
+        OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>().eq("order_no", nccJcQilibcBarcodeflowWms.getZkdh()).eq("matnr", mat.getMatnr()).eq("batch", nccJcQilibcBarcodeflowWms.getVbatchcode()));
+        if (orderDetlPakin == null) {
+            throw new CoolException("鏈壘鍒版鍗曞彿");
+        }
+        matParam.setStandby1(orderDetlPakin.getStandby1());
         matParam.setOrderNo(nccJcQilibcBarcodeflowWms.getZkdh());
         matParam.setBatch(nccJcQilibcBarcodeflowWms.getVbatchcode());
         matParam.setAnfme(nccJcQilibcBarcodeflowWms.getAsnnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getAsnnum().doubleValue());
+        matParam.setWeight(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue());
         matParam.setAnfme2(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue());
+        matParam.setTiaoma(nccJcQilibcBarcodeflowWms.getVbarcode());
         return R.ok().add(matParam);
+
     }
 
     @RequestMapping(value = "/mat/auth")
@@ -266,9 +280,53 @@
         matParam.setBatch(nccJcQilibcBarcodeflowWms.getVbatchcode());
         matParam.setAnfme(nccJcQilibcBarcodeflowWms.getAsnnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getAsnnum().doubleValue());
         matParam.setAnfme2(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue());
+        matParam.setTiaoma(nccJcQilibcBarcodeflowWms.getVbarcode());
         return R.ok().add(matParam);
     }
 
+    @RequestMapping(value = "/mat/back")
+    @ManagerAuth
+    public R pdaSearchBack(@RequestParam String barcode) {
+        WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>()
+                .eq("barcode", barcode)
+                .in("io_type", 101, 103, 107)
+                .orderBy("appe_time", false)
+        );
+
+        if(null == wrkMastLog) {
+            return R.error("鏈壘鍒版鎵樼洏鐮佸嚭搴撹褰�");
+        }
+
+        List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>()
+                .eq("wrk_no", wrkMastLog.getWrkNo())
+                .eq("zpallet", barcode)
+                .orderBy("io_time", false)
+        );
+        if (wrkDetlLogs.isEmpty()) {
+            return R.error("鏈壘鍒版鎵樼洏鐮佸嚭搴撹褰曟槑缁�");
+        }
+
+        WrkDetlLog wrkDetlLog = wrkDetlLogs.get(0);
+        String batch = wrkDetlLog.getBatch();
+
+        HashMap<String, Object> map = new HashMap<>();
+        Mat mat = matService.selectByMatnr(wrkDetlLog.getMatnr());
+        if (mat == null) {
+            return R.error("鏈壘鍒扮墿鏂欐槑缁�");
+        }
+        MatParam matParam = new MatParam();
+        Synchro.Copy(mat, matParam);
+        matParam.setBatch(batch);
+        matParam.setAnfme(0.0D);
+        matParam.setAnfme2(0.0D);
+        matParam.setTiaoma(batch);
+
+        String[] split = wrkDetlLog.getOrderNo().split("-");
+        map.put("orderNo", split[0]);
+        map.put("matData", matParam);
+        return R.ok().add(map);
+    }
+
     @RequestMapping("/comb/auth")
     @ManagerAuth(memo = "缁勬墭")
     public R comb(@RequestBody CombParam combParam) {

--
Gitblit v1.9.1