From f3cac25391d657dea7be24ba82862c867d7eb752 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 30 十二月 2024 11:15:33 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |  276 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 255 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index b8f8d62..8279896 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -26,6 +26,8 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -74,6 +76,10 @@
     private ManLocDetlService manLocDetlService;
     @Autowired
     private ManLocDetlMapper manLocDetlMapper;
+    @Resource
+    private InventoryCheckOrderService checkOrderService;
+    @Resource
+    private InventoryCheckOrderDetlService checkOrderDetlService;
 
     @Resource
     private BasDevpMapper basDevpMapper;
@@ -82,18 +88,29 @@
     public R inLocCallAgv(String sta, String inSta) {
 
         BasDevp basDevp = basDevpMapper.selectById(inSta);
-        // 0.鍑哄簱妯″紡锛�1.agv鍏ュ簱涓紝2.鐢熸垚鍏ュ簱浠诲姟
-        if (basDevp.getDevMk().equals("0")) { // 鏄嚭搴�
-             // 鍒ゆ柇鏄惁鏈夊嚭搴撲换鍔�
-            int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
-                    .eq("sta_no", inSta).lt("wrk_sts",14).in("io_type",101,103,107,110));
-            if (count == 0) {
-                // 娌℃湁鍑哄簱浠诲姟锛屾洿鏀逛负鍏ュ簱妯″紡
-                basDevp.setDevMk("1");
-                basDevpMapper.updateById(basDevp);
-            } else {
-                return R.parse(inSta + "绔欑偣瀛樺湪鍑哄簱浠诲姟");
-            }
+
+        // 鍒ゆ柇鏄惁鏈夊嚭搴撲换鍔�
+        Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().lt("wrk_sts", 14).in("io_type", 101, 103, 107, 110);
+
+        switch (inSta) {
+            case "1040":
+                wrapper.in("source_sta_no", "1043", "1044");
+                break;
+            case "2010":
+                wrapper.in("source_sta_no", "2013", "2014");
+                break;
+            case "2000":
+                wrapper.in("source_sta_no", "2003", "2004");
+                break;
+            case "3010":
+                wrapper.in("source_sta_no", "3013", "3014");
+                break;
+            default:
+        }
+        int count = wrkMastService.selectCount(wrapper);
+        log.info("鍏ュ簱鍛煎彨agv鍛煎彨绔欑偣锛歿}锛岀洰鏍囩珯鐐癸細{},鍑哄簱浠诲姟鏁帮細{}",sta,inSta,count);
+        if (count != 0) {
+            return R.parse(inSta + "绔欑偣瀛樺湪鍑哄簱浠诲姟");
         }
 
         // 鍏堢粦瀹�
@@ -125,10 +142,13 @@
                     .build()
                     .doPost();
             JSONObject jsonObject = JSON.parseObject(response);
-            jsonObject.getString("message");
             if (jsonObject.getInteger("code").equals(0)) {
                 success = true;
+                // 鍏ュ簱鏆傚瓨+1
+                basDevp.setInQty(basDevp.getInQty() + 1);
+                basDevpMapper.updateById(basDevp);
             } else {
+                message = jsonObject.getString("message");
                 log.error("鍏ュ簱鍛煎彨agv澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);
             }
         } catch (Exception e) {
@@ -262,11 +282,15 @@
         if(param.getCombMats().size()>1){
             throw new CoolException("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒");
         }
-        // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
-//        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
-//                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
-//            throw new CoolException(param.getBarcode() + "鏁版嵁姝e湪杩涜鍏ュ簱");
-//        }
+        param.getCombMats().forEach(elem -> {
+            // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+            if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+                    eq("zpallet", param.getBarcode())
+                    .eq("io_status", "N")
+                    .eq("matnr",elem.getMatnr()).eq("batch",elem.getBatch())) > 0) {
+                throw new CoolException(param.getBarcode() + "宸叉湁鐩稿悓鏁版嵁");
+            }
+        });
 
         if(param.getBarcode().length()!=9){
             throw new CoolException("鏉$爜闀垮害涓嶆槸9浣�===>>" + param.getBarcode());
@@ -287,6 +311,15 @@
             // 鐢熸垚鍏ュ簱閫氱煡妗�
             List<DetlDto> detlDtos = new ArrayList<>();
             param.getCombMats().forEach(elem -> {
+
+                // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+                if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+                        eq("zpallet", param.getBarcode())
+                        .eq("io_status", "N")
+                        .eq("matnr",elem.getMatnr()).eq("batch",elem.getBatch())) > 0) {
+                    throw new CoolException(param.getBarcode() + "宸叉湁鐩稿悓鏁版嵁");
+                }
+
                 DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
                 if (DetlDto.has(detlDtos, detlDto)) {
                     DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
@@ -345,7 +378,9 @@
                     throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
                 }
 
-                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getManu());
+//                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getManu());
+                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getSuppCode()
+                        , orderDetl.getManu(),orderDetl.getSku(),orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2(),orderDetl.getTemp3(),orderDetl.getTemp4());
                 if (DetlDto.has(detlDtos, detlDto)) {
                     DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                     assert one != null;
@@ -372,7 +407,20 @@
                 waitPakin.setAppeTime(now);
                 waitPakin.setModiUser(userId);
                 waitPakin.setModiTime(now);
-                waitPakin.setManu(detlDto.getMark());
+                waitPakin.setManu(detlDto.getMark()); //鏍囪
+                waitPakin.setOrigin(order.getItemName());//浠撳簱
+                waitPakin.setSupp(detlDto.getSuppName()); //渚涘簲鍟�
+                waitPakin.setSku(detlDto.getCustomer()); //瀹㈡埛鍚嶇О
+                waitPakin.setThreeCode(detlDto.getOrderNo()); //u8鍙戣繃鏉ョ殑璁㈠崟鍙�
+                waitPakin.setSuppCode(detlDto.getFromOrderNo()); //鏉ユ簮鍗曞彿
+                waitPakin.setTemp1(detlDto.getTemp1());
+                waitPakin.setTemp2(detlDto.getTemp2());
+                waitPakin.setTemp3(detlDto.getTemp3());
+                waitPakin.setTemp4(detlDto.getTemp4());
+                int countWrk2 = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
+                if (countWrk2 > 0) {
+                    throw new CoolException("宸ヤ綔妗f潯鐮佹暟鎹凡瀛樺湪===>>" + param.getBarcode());
+                }
                 if (!waitPakinService.insert(waitPakin)) {
                     throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
                 }
@@ -761,7 +809,7 @@
         Date now = new Date();
         for(OrderDetl orderDetl : orderDetls){
             //鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
-            List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null);
+            List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
             if (locDetls.size() == 0) {
                 throw new CoolException("搴撳瓨涓病鏈夎鐗╂枡");
             }
@@ -876,6 +924,192 @@
     }
 
     @Override
+    public void pdaAdjust(pdaAdjustParam param, Long userId) {
+        if (Cools.isEmpty(param)){
+            throw new CoolException("鐩樼偣鍒楄〃鍙傛暟涓虹┖");
+        }
+        for (InventoryCheckOrderDetl orderDetl: param.getParam()){
+            InventoryCheckOrderDetl inventoryCheckOrderDetl = checkOrderDetlService.selectOne(new EntityWrapper<InventoryCheckOrderDetl>()
+                    .eq("order_no", orderDetl.getOrderNo())
+                    .eq("matnr", orderDetl.getMatnr())
+                    .eq("batch", orderDetl.getBatch()));
+            if (Cools.isEmpty(inventoryCheckOrderDetl)){
+                throw new CoolException("鏈煡璇㈠埌鐩樼偣淇℃伅");
+            }
+            if (!inventoryCheckOrderDetl.getStatus().equals("1")){
+                throw new CoolException("璇ヤ换鍔″凡鐩樼偣");
+            }
+            inventoryCheckOrderDetl.setCheckAnfme(orderDetl.getCheckAnfme());
+            inventoryCheckOrderDetl.setStatus("2");
+            if (!checkOrderDetlService.updateById(inventoryCheckOrderDetl)){
+                throw new CoolException("淇濆瓨鐩樼偣淇℃伅澶辫触!");
+            }
+
+        }
+
+
+
+    }
+
+    @Override
+    @Transactional
+    public void inventoryUpload(String orderId) {
+        if (Cools.isEmpty(orderId)){
+            throw new CoolException("鐩樼偣鍗昳d涓虹┖");
+        }
+        InventoryCheckOrder inventoryCheckOrder = checkOrderService.selectById(orderId);
+        if (Cools.isEmpty(inventoryCheckOrder)){
+            throw new CoolException("鏈壘鍒扮洏鐐瑰崟");
+        }
+        if (inventoryCheckOrder.getStatus().equals("2")){
+            throw new CoolException("鐩樼偣鍗曞凡鎻愪氦");
+        }
+        int count = checkOrderDetlService.selectCount(new EntityWrapper<InventoryCheckOrderDetl>()
+                .eq("order_no", inventoryCheckOrder.getOrderNo()).isNull("check_anfme"));
+        if (count>0){
+            throw new CoolException("鏈夋湭瀹屾垚鐨勭洏鐐逛换鍔�");
+        }
+
+        List<InventoryCheckOrderDetl> checkOrderProfitDetls = checkOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>()
+                .eq("order_no", inventoryCheckOrder.getOrderNo())
+                .addFilter("anfme < check_anfme"));
+        if (!checkOrderProfitDetls.isEmpty()){
+            //鑾峰彇鐩樼泩鍗昿aram
+            InventoryErpParam erpProfitParam = getErpProfitParam(inventoryCheckOrder, checkOrderProfitDetls);
+            uploadErp(erpProfitParam);
+        }
+
+        List<InventoryCheckOrderDetl> checkOrderDeficitDetls = checkOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>()
+                .eq("order_no", inventoryCheckOrder.getOrderNo())
+                .addFilter("anfme > check_anfme"));
+
+        if (!checkOrderDeficitDetls.isEmpty()){
+            //鑾峰彇鐩樹簭鍗昿aram
+            InventoryErpParam erpDeficitParam = getErpDeficitParam(inventoryCheckOrder, checkOrderDeficitDetls);
+            uploadErp(erpDeficitParam);
+        }
+
+        inventoryCheckOrder.setStatus("2");
+        if (!checkOrderService.updateById(inventoryCheckOrder)){
+            throw new CoolException("鐘舵�佹洿鏂板け璐�");
+        }
+
+
+
+
+    }
+
+    public void uploadErp(InventoryErpParam param){
+        String response = "";
+        boolean success = false;
+        try {
+            HashMap<String, Object> headers = new HashMap<>();
+            headers.put("Content-Type", "application/json");
+            response = new HttpHandler.Builder()
+                    .setHeaders(headers)
+                    .setUri("10.0.100.160:30108")
+                    .setPath("web/apps/gongqi.df.dataTrans/DTInterFace/doJobWithupdateBody")
+                    .setJson(JSON.toJSONString(param))
+                    .build()
+                    .doPost();
+            JSONObject jsonObject = JSON.parseObject(response);
+            if (jsonObject.getInteger("errcode").equals(0)) {
+                success = true;
+            } else if (jsonObject.getInteger("errcode").equals(1)) {
+                log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(param), response);
+                throw new CoolException(jsonObject.getString("msg"));
+            } else {
+                log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(param), response);
+                throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+            }
+        } catch (Exception e) {
+            log.error("fail", e);
+            throw new CoolException(e.getMessage());
+        } finally {
+            try {
+                // 淇濆瓨鎺ュ彛鏃ュ織
+                apiLogService.save(
+                        "鐩樼偣鍗曚笂鎶�",
+                        MesConstant.URL + MesConstant.PACK_DOWN_URL,
+                        null,
+                        "127.0.0.1",
+                        JSON.toJSONString(param),
+                        response,
+                        success
+                );
+            } catch (Exception e) { log.error("", e); }
+        }
+    }
+
+    public InventoryErpParam getErpProfitParam(InventoryCheckOrder inventoryCheckOrder,List<InventoryCheckOrderDetl> checkOrderProfitDetls) {
+        Date date = new Date();
+        InventoryErpParam erpProfitParam = new InventoryErpParam();
+        InventoryErpParam.DataJson dataJson = new InventoryErpParam.DataJson();
+        dataJson.setFlowCode("LIKUwms12GOTmes");
+        dataJson.setTableCode("DTInventInTable_pdd");
+        dataJson.setLogName("鐩樼泩鍗�-鍏ュ簱鍗�");
+        erpProfitParam.setDataJson(dataJson);
+        List<InventoryErpParam.UpdateJson> updateJsonList = new ArrayList<>();
+        InventoryErpParam.UpdateJson updateJson = new InventoryErpParam.UpdateJson();
+        updateJson.setOrderNo(inventoryCheckOrder.getOrderNo());
+        updateJson.setDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date));
+        List<InventoryErpParam.MatDetails> matDetails = new ArrayList<>();
+        for (InventoryCheckOrderDetl checkOrderProfitDetl: checkOrderProfitDetls){
+            InventoryErpParam.MatDetails matDetail = new InventoryErpParam.MatDetails();
+
+            Mat mat = matService.selectByMatnr(checkOrderProfitDetl.getMatnr());
+
+            matDetail.setMatnr(checkOrderProfitDetl.getMatnr());
+            matDetail.setBatch(checkOrderProfitDetl.getBatch());
+            matDetail.setSpecs(mat.getSpecs());
+            Double anfme = new BigDecimal(checkOrderProfitDetl.getCheckAnfme()).subtract(new BigDecimal(checkOrderProfitDetl.getAnfme())).doubleValue();
+            matDetail.setAnfme(anfme);
+            matDetail.setLocNo(checkOrderProfitDetl.getLocNo());
+            matDetail.setWarehouse(checkOrderProfitDetl.getArea());
+            matDetail.setSeq(updateJson.getMatDetails() == null?1:updateJson.getMatDetails().size()+1);
+            matDetails.add(matDetail);
+        }
+        updateJson.setMatDetails(matDetails);
+        updateJsonList.add(updateJson);
+        erpProfitParam.setUpdateJson(updateJsonList);
+        return erpProfitParam;
+    }
+
+    public InventoryErpParam getErpDeficitParam(InventoryCheckOrder inventoryCheckOrder,List<InventoryCheckOrderDetl> checkOrderDeficitDetls) {
+        Date date = new Date();
+        InventoryErpParam erpDeficitParam = new InventoryErpParam();
+        InventoryErpParam.DataJson dataJson = new InventoryErpParam.DataJson();
+        dataJson.setFlowCode("LIKUwms12GOTmes");
+        dataJson.setTableCode("DTInventOutTable_pdd");
+        dataJson.setLogName("鐩樹簭鍗�-鍑哄簱鍗�");
+        erpDeficitParam.setDataJson(dataJson);
+        List<InventoryErpParam.UpdateJson> updateJsonList2 = new ArrayList<>();
+        InventoryErpParam.UpdateJson updateJson2 = new InventoryErpParam.UpdateJson();
+        updateJson2.setOrderNo(inventoryCheckOrder.getOrderNo());
+        updateJson2.setDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date));
+        List<InventoryErpParam.MatDetails> matDetails = new ArrayList<>();
+        for (InventoryCheckOrderDetl checkOrderDeficitDetl: checkOrderDeficitDetls){
+            InventoryErpParam.MatDetails matDetail = new InventoryErpParam.MatDetails();
+
+            Mat mat = matService.selectByMatnr(checkOrderDeficitDetl.getMatnr());
+
+            matDetail.setMatnr(checkOrderDeficitDetl.getMatnr());
+            matDetail.setBatch(checkOrderDeficitDetl.getBatch());
+            matDetail.setSpecs(mat.getSpecs());
+            Double anfme = new BigDecimal(checkOrderDeficitDetl.getAnfme()).subtract(new BigDecimal(checkOrderDeficitDetl.getCheckAnfme())).doubleValue();
+            matDetail.setAnfme(anfme);
+            matDetail.setLocNo(checkOrderDeficitDetl.getLocNo());
+            matDetail.setWarehouse(checkOrderDeficitDetl.getArea());
+            matDetail.setSeq(updateJson2.getMatDetails() == null?1:updateJson2.getMatDetails().size()+1);
+            matDetails.add(matDetail);
+        }
+        updateJson2.setMatDetails(matDetails);
+        updateJsonList2.add(updateJson2);
+        erpDeficitParam.setUpdateJson(updateJsonList2);
+        return erpDeficitParam;
+    }
+
+    @Override
     @Transactional
     public void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
                          Double curOutQty, Integer ioType, Long userId, Date now) {

--
Gitblit v1.9.1