From 6f01b51fc0770fda7787076caf0314be7a7f6656 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 27 六月 2025 10:58:21 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   87 +++++++++++++++++++++++++++++++++++++------
 1 files changed, 74 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index effe8ca..a9cdf6e 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -19,12 +19,17 @@
 import com.zy.common.utils.Synchro;
 import com.zy.common.web.BaseController;
 import com.zy.nc.entity.NccJcQilibcBarcodeflowWms;
+import com.zy.nc.entity.NccQilibcTmprintWms;
+import com.zy.nc.entity.NccSaleXclGgsybWms;
 import com.zy.nc.service.NccJcQilibcBarcodeflowWmsService;
+import com.zy.nc.service.NccQilibcTmprintWmsService;
+import com.zy.nc.service.NccSaleXclGgsybWmsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -61,11 +66,17 @@
     private WrkDetlLogService wrkDetlLogService;
     @Autowired
     private WrkMastLogService wrkMastLogService;
+    @Autowired
+    private StoreTypeService storeTypeService;
 
     @Autowired
     private MatService matService;
     @Autowired
     private NccJcQilibcBarcodeflowWmsService nccJcQilibcBarcodeflowWmsService;
+    @Autowired
+    private NccQilibcTmprintWmsService nccQilibcTmprintWmsService;
+    @Autowired
+    private NccSaleXclGgsybWmsService nccSaleXclGgsybWmsService;
     @Autowired
     private OrderPakinService orderPakinService;
 
@@ -264,23 +275,21 @@
     @RequestMapping(value = "/mat/auth")
     @ManagerAuth
     public R pdaSearchV3(@RequestParam String matnr) {
-        EntityWrapper<NccJcQilibcBarcodeflowWms> wrapper = new EntityWrapper<>();
-        wrapper.eq("VBARCODE", matnr).orderBy("ts", false);
-        NccJcQilibcBarcodeflowWms nccJcQilibcBarcodeflowWms = nccJcQilibcBarcodeflowWmsService.selectOne(wrapper);
-        if (null == nccJcQilibcBarcodeflowWms) {
+        EntityWrapper<NccQilibcTmprintWms> wrapper = new EntityWrapper<>();
+        wrapper.eq("BARCODE", matnr).orderBy("PRINTTIME", false);
+        NccQilibcTmprintWms nccQilibcTmprintWms = nccQilibcTmprintWmsService.selectOne(wrapper);
+        if (null == nccQilibcTmprintWms) {
             return R.error("鏈壘鍒版鏉＄爜");
-        } else {
-            if (!nccJcQilibcBarcodeflowWms.getInfla().equals("鍑哄簱")) {
-                return R.error("璇ユ潯鐮佹渶鍚庝竴娆′笉鏄嚭搴�");
-            }
         }
-        Mat mat = matService.selectByMatnr(nccJcQilibcBarcodeflowWms.getWlbm());
+        Mat mat = matService.selectByMatnr(nccQilibcTmprintWms.getWlbm());
         MatParam matParam = new MatParam();
         Synchro.Copy(mat, matParam);
-        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());
+        matParam.setBatch(nccQilibcTmprintWms.getVbatchcode());
+//        matParam.setAnfme(nccQilibcTmprintWms.getAsnnum() == null ? 0.0D : nccQilibcTmprintWms.getAsnnum().doubleValue());
+//        matParam.setAnfme2(nccQilibcTmprintWms.getNastnum() == null ? 0.0D : nccQilibcTmprintWms.getNastnum().doubleValue());
+        matParam.setAnfme(0.0D);
+        matParam.setAnfme2(0.0D);
+        matParam.setTiaoma(nccQilibcTmprintWms.getBarcode());
         return R.ok().add(matParam);
     }
 
@@ -334,6 +343,58 @@
         return R.ok("缁勬墭鎴愬姛");
     }
 
+    @RequestMapping("/comb2/auth")
+    @ManagerAuth(memo = "閲囪喘缁勬墭")
+    public R comb2(@RequestBody CombParam combParam) {
+        CombParam.CombMat combMat = combParam.getCombMats().get(0);
+
+        ArrayList<String> ckbmList = new ArrayList<>();
+        List<StoreType> storeTypes = storeTypeService.selectList(new EntityWrapper<StoreType>()
+                .like("store_name", "绔嬩綋搴�"));
+        for (StoreType storeType : storeTypes) {
+            ckbmList.add(storeType.getStoreId());
+        }
+
+        NccSaleXclGgsybWms nccSaleXclGgsybWms = nccSaleXclGgsybWmsService.selectOne(new EntityWrapper<NccSaleXclGgsybWms>()
+                .eq("WLBM", combMat.getMatnr())
+                .eq("VBATCHCODE", combMat.getBatch())
+                .in("CKBM", ckbmList)
+        );
+        if(null == nccSaleXclGgsybWms) {
+            return R.error("鏈煡鍒癊RP搴撳瓨");
+        }
+
+        //ERP搴撳瓨鏁伴噺
+        BigDecimal zsl = nccSaleXclGgsybWms.getZsl();
+
+        //鑾峰彇绔嬪簱鏁伴噺
+        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+                .eq("matnr", combMat.getMatnr())
+                .eq("batch", combMat.getBatch())
+        );
+        BigDecimal stockNum = new BigDecimal(0);
+        for (LocDetl locDetl : locDetls) {
+            stockNum = stockNum.add(BigDecimal.valueOf(locDetl.getAnfme()));
+        }
+
+        //鍔犱笂缁勬墭鏁伴噺
+        for (CombParam.CombMat mat : combParam.getCombMats()) {
+            stockNum = stockNum.add(BigDecimal.valueOf(mat.getAnfme()));
+        }
+
+        if(stockNum.doubleValue() > zsl.doubleValue()) {
+            return R.error("缁勬墭鏁伴噺瓒呰繃ERP搴撳瓨");
+        }
+
+        List<CombParam.CombMat> combMats = combParam.getCombMats();
+        for (CombParam.CombMat mat : combMats) {
+            mat.setStandby1(nccSaleXclGgsybWms.getCkbm());
+        }
+
+        mobileService.comb(combParam, getUserId());
+        return R.ok("缁勬墭鎴愬姛");
+    }
+
     @RequestMapping("/pack/get/auth")
     @ManagerAuth
     public R packGet(@RequestParam String barcode) {

--
Gitblit v1.9.1