From 1286f6fd5625d3d058d1dcff11b8fda303d6c455 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 11 三月 2025 10:28:43 +0800
Subject: [PATCH] 四期

---
 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java |  340 +++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 239 insertions(+), 101 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index 96ef1d5..84fd2a5 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -5,7 +5,9 @@
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
+import com.core.common.SnowflakeIdWorker;
 import com.core.exception.CoolException;
+import com.zy.asrs.constant.AsrsConstants;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.MesBuyPakinReportParam;
 import com.zy.asrs.entity.param.MesOrderReportParam;
@@ -14,7 +16,7 @@
 import com.zy.asrs.service.*;
 import com.zy.asrs.task.AbstractHandler;
 import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.utils.HttpHandler;
+import com.zy.common.service.AgvCommonService;
 import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +27,8 @@
 import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
+
+import static org.reflections.Reflections.log;
 
 @Slf4j
 @Service
@@ -43,10 +47,10 @@
     //绉诲簱绫诲瀷鏁扮粍
     private static final List<Integer> MOVE_TYPE_List = new ArrayList<Integer>() {{
         add(11);
-        add(101);
         add(12);
         add(53);
         add(101);
+        add(103);
         add(108);
         add(111);
         add(112);
@@ -57,6 +61,8 @@
 
     @Value("${agvBasDev.maxWorkNum}")
     private int maxWrokNum;
+    @Value("${mes.report}")
+    private Boolean flag;
     @Value("${mes.url}")
     private String url;
     @Value("${mes.getTokenUrl}")
@@ -105,12 +111,25 @@
     private DocTypeService docTypeService;
     @Autowired
     private OrderDetlService orderDetlService;
+    @Autowired
+    private SnowflakeIdWorker snowflakeIdWorker;
+    @Autowired
+    private FlowLogService flowLogService;
+
+    @Autowired
+    private ReportDataService reportDataService;
+
+    @Autowired
+    private AgvCommonService agvCommonService;
+
 
     @Transactional
     public ReturnT<String> completedPutWayWrk(AgvWrkMast agvWrkMast) {
         //鐢ㄤ簬涓婃姤mes鐨勫伐浣滄。鏄庣粏
         List<AgvWrkDetl> agvWrkDetlListOld = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
 
+        long flowId = snowflakeIdWorker.nextId();
+        Date now = new Date();
         try {
             int wrkNo = agvWrkMast.getWrkNo();
             String barcode = agvWrkMast.getBarcode();
@@ -123,6 +142,26 @@
             }
 
 
+            Integer pltType = agvWrkMast.getPltType();
+            if (Cools.isEmpty(pltType)) {
+                AgvLocMast agvLocMast;
+                if (!Cools.isEmpty(agvWrkMast.getLocNo())) {
+                    agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
+                    if (agvLocMast != null) {
+                        pltType = agvLocMast.getPltType();
+                    }
+                }
+                if (!Cools.isEmpty(agvWrkMast.getSourceLocNo())) {
+                    agvLocMast = agvLocMastService.selectById(agvWrkMast.getSourceLocNo());
+                    if (agvLocMast != null) {
+                        pltType = agvLocMast.getPltType();
+                    }
+                }
+                if (pltType != null) {
+                    agvWrkMast.setPltType(pltType);
+                }
+                //log.info("宸ヤ綔鍙�--{},浠撳簱缂栫爜锛歿}", agvWrkMast.getWrkNo(), agvWrkMast.getPltType());
+            }
             agvWrkMast.setModiTime(new Date());
             //淇敼宸ヤ綔妗g姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚
             agvWrkMast.setWrkSts(207L);
@@ -139,7 +178,7 @@
 
             switch (agvWrkMast.getIoType()) {
                 case 1:
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
+                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue(), agvWrkMast.getCtnNo());
                     //鏇存柊鐩爣搴撲綅鏄庣粏
                     log.info("鏇存柊鐩爣搴撲綅鏄庣粏 agvWrkMast.getLocNo(): " + agvWrkMast.getLocNo() + ", wrkNo: " + wrkNo);
                     agvLocDetlService.addLocDetlInfo(agvWrkMast.getLocNo(), wrkNo);
@@ -151,15 +190,28 @@
                     break;
                 case 10:
                     agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "D", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
-                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", (short) 0);
+                    AgvBasDevp byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
+                    if (byDevNo != null) {
+                        if ("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts())) {
+
+                        } else {
+                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
+                        }
+                    }
+                    //agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", (short) 0);
                     break;
                 case 11:
                 case 12:
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
+                    AgvLocDetl agvLocDetl1 = agvLocDetlService.selectByLocNo(agvWrkMast.getLocNo());
+                    if (agvLocDetl1 == null) {
+                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "D", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
+                    } else {
+                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
+                    }
                     //鏇存柊搴撳瓨鏄庣粏
                     agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
                     //淇敼婧愬簱浣嶇姸鎬佷负O
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", null);
+                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", null, "");
                     break;
                 case 53:
                     //淇敼宸ヤ綔鍏氭槑缁�
@@ -169,16 +221,51 @@
                         AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
                         if (!Cools.isEmpty(agvLocDetl)) {
                             double updateAnfme = agvLocDetl.getAnfme() - agvWrkDetl.getAnfme();
+//                            OrderDetl orderDetl = orderDetlService.selectItem(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getThreeCode());
+//                            FlowLog flowLog = new FlowLog();
+//                            flowLog.setFid(String.valueOf(flowId));
+//                            flowLog.setSpare2(String.valueOf(agvWrkMast.getWrkNo()));
+//                            flowLog.setLocNo(agvWrkMast.getLocNo());
+//                            flowLog.setSpare1(agvWrkDetl.getSuppCode());
+//                            flowLog.setOpType(53L);
+//                            flowLog.setOrderNo(agvWrkDetl.getOrderNo());
+//                            flowLog.setThreeCode(agvWrkDetl.getThreeCode());
+//                            flowLog.setMatnr(agvWrkDetl.getMatnr());
+//                            flowLog.setMaktx(agvWrkDetl.getMaktx());
+//
+//                            flowLog.setOrderPrevious(orderDetl.getAnfme());
+//                            flowLog.setOrderCurrent(orderDetl.getAnfme());
+//                            flowLog.setOrderChanged(0.0);
+//
+//                            flowLog.setQtyPrevious(orderDetl.getQty());
+//                            flowLog.setQtyCurrent(updateAnfme);
+//                            flowLog.setQtyChanged(agvWrkDetl.getAnfme());
+//
+//                            flowLog.setLocPrevious(agvLocDetl.getAnfme());
+//                            flowLog.setLocCurrent(updateAnfme);
+//                            flowLog.setLocChanged(agvWrkDetl.getAnfme());
+//
+//                            flowLog.setAppeTime(now);
+//                            if (!flowLogService.insert(flowLog)) {
+//                                throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+//                            }
+                            log.info("53娣诲姞搴撳瓨鏃ュ織:{},{}", updateAnfme, JSON.toJSON(agvLocDetl));
                             agvLocDetlService.updateAnfme(updateAnfme, agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getBatch(), agvLocDetl.getThreeCode(), agvLocDetl.getDeadTime());
                         }
                         //AgvLocDetl agvLocDetl = agvLocDetlService.selectLocdetl(agvWrkMast.getLocNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getBatch(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
 
                     });
                     agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
-                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
+                     byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
+                    if (byDevNo != null) {
+                        if ("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts())) {
+
+                        } else {
+                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
+                        }
+                    }
                     break;
                 case 57:
-                    Date now = new Date();
                     // 鏇存柊搴撳瓨鏄庣粏
                     List<AgvWrkDetl> wrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
                     wrkDetlList.forEach(agvWrkDetl -> {
@@ -187,13 +274,21 @@
                         agvLocDetl.sync(agvWrkDetl);
                         agvLocDetl.setModiTime(now);
                         agvLocDetl.setAppeTime(now);
+                        log.info("57娣诲姞搴撳瓨鏃ュ織:{}", JSON.toJSON(agvLocDetl));
                         if (!agvLocDetlService.insert(agvLocDetl)) {
                             throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
                         }
                     });
                     // 鏇存柊绔欑偣 + 搴撲綅鐘舵��     婧愬簱浣嶆槸绔欑偣
-                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
+                     byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
+                    if (byDevNo != null) {
+                        if ("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts())) {
+
+                        } else {
+                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
+                        }
+                    }
+                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue(), agvWrkMast.getCtnNo());
                     break;
                 case 58:
                     agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
@@ -202,10 +297,10 @@
                 case 108:
                 case 114:
                     agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
-                    //鏇存柊搴撳瓨鏄庣粏
-                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
-                    //淇敼婧愬簱浣嶇姸鎬佷负O
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
+//                    //鏇存柊搴撳瓨鏄庣粏
+//                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
+//                    //淇敼婧愬簱浣嶇姸鎬佷负O
+//                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
                     break;
                 case 109:
                     // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅
@@ -221,7 +316,7 @@
                         // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅
                     } else {
                         //淇敼婧愬簱浣嶇姸鎬佷负O
-                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
+                        //agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
                     }
                     break;
                 case 111:
@@ -252,6 +347,7 @@
                         locDetl.setLocNo(agvWrkMast.getLocNo());
                         locDetl.sync(agvWrkDetl);
                         locDetl.setModiTime(new Date());
+                        log.info("112娣诲姞搴撳瓨鏃ュ織:{}", JSON.toJSON(locDetl));
                         agvLocDetlService.insert(locDetl);
                     }
                     // 鎺ラ┏浣� -- 搴撲綅
@@ -297,12 +393,13 @@
 
             if (!isJSON(orderNo)) {
                 //妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚
-                orderService.checkComplete(orderNo, agvWrkMast.getLocNo());
+                orderService.checkComplete(orderNo, pltType);
             } else {
                 List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
+                Integer finalPltType = pltType;
                 maps.forEach(map -> {
                     String o = map.get("orderNo").toString();
-                    orderService.checkComplete(o, agvWrkMast.getLocNo());
+                    orderService.checkComplete(o, finalPltType);
                 });
             }
 
@@ -318,11 +415,7 @@
         }
         //TODO
         //鏆傛椂鍔犱笂trycatch
-        try {
-            reportMes(agvWrkMast, agvWrkDetlListOld);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        reportMes(agvWrkMast, agvWrkDetlListOld);
         return SUCCESS;
     }
 
@@ -362,24 +455,52 @@
                     wrkMast.setIoTime(now);
                     //浼樺厛绾�
                     wrkMast.setIoPri(300.0);
+
                     //婧愮珯鐐�
                     wrkMast.setSourceLocNo(agvWrkMast.getLocNo());
+
                     //鐩爣绔欑偣
-                    wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
+                    if (agvWrkMast.getLocNo().startsWith("QO") && agvWrkMast.getLocNo().endsWith("F4") && Integer.valueOf(agvWrkMast.getBarcode().substring(0, 2)) == 30) {
+                        if (!agvWrkMast.getSourceLocNo().endsWith("02F1")) {
+                            AgvLocMast locByFloor = null;
+                            try {
+                                locByFloor = agvCommonService.getLocByLocRule(3, 1, AsrsConstants.ERCHANG, true);
+                            } catch (Exception e) {
+
+                            }
+                            if (locByFloor != null && locByFloor.getLocNo().endsWith("02F1")) {
+                                AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getSourceLocNo());
+                                agvLocMast.setLocSts("O");
+                                agvLocMast.setModiTime(now);
+                                agvLocMast.setBarcode("");
+                                agvLocMastService.updateById(agvLocMast);
+                                wrkMast.setLocNo(locByFloor.getLocNo());
+                            } else {
+                                wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
+                            }
+                        } else {
+                            wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
+                        }
+                    } else {
+                        wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
+                    }
+                    //wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
+
                     //璐ф灦缂栫爜
                     wrkMast.setBarcode(agvWrkMast.getBarcode());
                     //璐ф灦绫诲瀷
                     wrkMast.setWhsType(Integer.valueOf(agvWrkMast.getBarcode().substring(0, 2)));
 
-                    wrkMast.setAppeUser(9527L);
+                    wrkMast.setAppeUser(agvWrkMast.getAppeUser());
                     wrkMast.setAppeTime(now);
                     wrkMast.setModiUser(9527L);
                     wrkMast.setModiTime(now);
+                    wrkMast.setPltType(agvWrkMast.getPltType());
                     wrkMast.setLogErrMemo("completedCarryWrk");
                     if (!agvWrkMastService.insertByIncrease(wrkMast)) {
                         throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");
                     }
-                    AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getSourceLocNo());
+                    AgvLocMast agvLocMast = agvLocMastService.selectById(wrkMast.getLocNo());
                     agvLocMast.setLocSts("S");
                     agvLocMast.setModiTime(now);
                     agvLocMastService.updateById(agvLocMast);
@@ -404,12 +525,12 @@
             agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkNo));
             if (!isJSON(orderNo)) {
                 //妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚
-                orderService.checkComplete(orderNo, agvWrkMast.getLocNo());
+                orderService.checkComplete(orderNo, agvWrkMast.getPltType());
             } else {
                 List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
                 maps.forEach(map -> {
                     String o = map.get("orderNo").toString();
-                    orderService.checkComplete(o, agvWrkMast.getLocNo());
+                    orderService.checkComplete(o, agvWrkMast.getPltType());
                 });
             }
 
@@ -425,6 +546,7 @@
         reportMes(agvWrkMast, agvWrkDetlListOld);
         return SUCCESS;
     }
+
 
     @Transactional
     public ReturnT<String> completedCarryWrk2(AgvWrkMast agvWrkMast) {
@@ -461,12 +583,12 @@
             agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkNo));
             if (!isJSON(orderNo)) {
                 //妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚
-                orderService.checkComplete(orderNo, agvWrkMast.getLocNo());
+                orderService.checkComplete(orderNo, agvWrkMast.getPltType());
             } else {
                 List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
                 maps.forEach(map -> {
                     String o = map.get("orderNo").toString();
-                    orderService.checkComplete(o, agvWrkMast.getLocNo());
+                    orderService.checkComplete(o, agvWrkMast.getPltType());
                 });
             }
             //涓婃姤mes
@@ -479,6 +601,7 @@
         } catch (Exception e) {
             log.error("" + e.getMessage());
         }
+        //TODO 寮犺秴
         reportMes(agvWrkMast, agvWrkDetlListOld);
         return SUCCESS;
     }
@@ -494,16 +617,24 @@
                 throw new CoolException("浠诲姟涓嬪彂澶辫触");
             }
 
-            agvWrkMast.setWrkSts(202L);
-            agvWrkMast.setModiTime(new Date());
-            agvWrkMastService.updateById(agvWrkMast);
+            //agvWrkMast.setWrkSts(202L);
+            //agvWrkMast.setModiTime(new Date());
+            //boolean b = agvWrkMastService.updateById(agvWrkMast);
+            boolean b = agvWrkMastService.updateWrkStsByWrkNo(Math.abs(agvWrkMast.getWrkNo()), 202L);
+            if (!b) {
+                log.info("鏇存柊浠诲姟鐘舵�佸け璐�,{}", agvWrkMast.getWrkNo());
+                throw new CoolException("鏇存柊浠诲姟鐘舵�佸け璐�");
+            } else {
+                log.info("鏇存柊浠诲姟鐘舵�佹垚鍔�,{}", agvWrkMast.getWrkNo());
+            }
             if (agvWrkMast.getIoType() == 1) {
                 //淇敼AGV鍏ュ簱閫氱煡妗g姸鎬佸叆鍑虹姸鎬佷负Y
                 agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(), "Y");
             }
             return SUCCESS;
         } catch (Exception e) {
-            log.error("淇敼AGV鍏ュ簱閫氱煡妗g姸鎬佸叆鍑虹姸鎬佷负Y" + e.getMessage());
+            //TODO
+            //log.error("淇敼AGV鍏ュ簱閫氱煡妗g姸鎬佸叆鍑虹姸鎬佷负Y,{}", e.getMessage());
         }
         return FAIL;
     }
@@ -653,21 +784,31 @@
     }
 
     private void reportMes(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls) {
+
         if (Cools.isEmpty(agvWrkDetls)) {
             return;
         }
+        List<AgvWrkDetl> data = new ArrayList<>();
         //鍖哄垎涓嶅悓浠诲姟绫诲瀷鐨勪笂鎶ユ柟寮�
+        for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
+            if (agvWrkDetl.getMatnr().compareTo("39") <= 0) {
+                data.add(agvWrkDetl);
+            }
+        }
+        if (!data.isEmpty()) {
+            if (IN_TYPE_LIST.contains(agvWrkMast.getIoType())) {
+                reportMesPakinOrder(agvWrkMast, data);
+            }
+//            if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) {
+//                reportMesPakoutOrder(agvWrkMast, data);
+//            }
+//            if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) {
+//                generateMesParam(agvWrkMast, data);
+//            }
+        }
 
-        if (IN_TYPE_LIST.contains(agvWrkMast.getIoType())) {
-            reportMesPakinOrder(agvWrkMast, agvWrkDetls);
-        }
-        if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) {
-            reportMesPakoutOrder(agvWrkMast, agvWrkDetls);
-        }
-        if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) {
-            generateMesParam(agvWrkMast, agvWrkDetls);
-        }
     }
+
 
     private void reportMesPakinOrder(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls) {
 
@@ -693,7 +834,7 @@
                 iteam.setLineNo(orderDetl.getItemNum());
                 iteam.setSupplierCode(order.getSalesman());
                 iteam.setUnit(agvWrkDetl.getUnit());
-
+                iteam.setRemark(agvWrkDetl.getThreeCode());
                 iteams.add(iteam);
 
                 mesBuyPakinReportParam.setCode(orderNo);
@@ -703,9 +844,9 @@
 
             } else {
                 MesPakinReportParam mesPakinReportParam = new MesPakinReportParam();
-                mesPakinReportParam.setInboundOrderCode(agvWrkDetl.getOrderNo());
+                //mesPakinReportParam.setInboundOrderCode(agvWrkDetl.getOrderNo());
                 mesPakinReportParam.setBizType("0");
-                mesPakinReportParam.setInventoryAttr(new MesPakinReportParam.InventoryAttr(agvWrkDetl.getThreeCode().trim(), agvWrkDetl.getMatnr(), agvWrkMast.getLocNo()));
+                mesPakinReportParam.setInventoryAttr(new MesPakinReportParam.InventoryAttr(null, agvWrkDetl.getMatnr(), agvWrkMast.getLocNo()));
                 mesPakinReportParam.setNoQrCodeExecAmount(new MesPakinReportParam.NoQrCodeExecAmount(agvWrkDetl.getAnfme(), agvWrkDetl.getUnit(), null));
 
                 doHttpRequest(mesPakinReportParam, getMesTokenInfo(), "涓婃姤mes鍏ュ簱淇℃伅", url, pakinReportPath, null, "127.0.0.1");
@@ -740,11 +881,11 @@
         MesOrderReportParam param = new MesOrderReportParam();
 
         List<MesOrderReportParam.TransferOrderItem> transferOrderItems = new ArrayList<>();
-        List<MesOrderReportParam.TransferOrderItem.InventoryDetail> inventoryDetails = new ArrayList<>();
-        List<MesOrderReportParam.RecordCustomFieldBaseCO.CustomField> customFields = new ArrayList<>();
+
+        //MesOrderReportParam.RecordCustomFieldBaseCO.CustomField customFields = new MesOrderReportParam.RecordCustomFieldBaseCO.CustomField();
 
         MesOrderReportParam.RecordCustomFieldBaseCO recordCustomFieldBaseCO = new MesOrderReportParam.RecordCustomFieldBaseCO();
-        recordCustomFieldBaseCO.setCustomFields(customFields);
+        //recordCustomFieldBaseCO.setCustomFields(customFields);
         param.setRecordCustomFieldBaseCO(recordCustomFieldBaseCO);
 
         //娣诲姞transferOrderItem灞炴��
@@ -759,11 +900,12 @@
             transferOrderItem.setTargetLocationCode(getTargetLocationByFloor(floor));
         }
         transferOrderItems.add(transferOrderItem);
-        transferOrderItem.setInventoryDetails(inventoryDetails);
+
 
         param.setTransferOrderItems(transferOrderItems);
 
         for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
+            List<MesOrderReportParam.TransferOrderItem.InventoryDetail> inventoryDetails = new ArrayList<>();
             MesOrderReportParam.TransferOrderItem.InventoryDetail inventoryDetail = new MesOrderReportParam.TransferOrderItem.InventoryDetail();
             //娣诲姞amount灞炴��
             MesOrderReportParam.TransferOrderItem.InventoryDetail.Amount amount = new MesOrderReportParam.TransferOrderItem.InventoryDetail.Amount(agvWrkDetl.getAnfme(), agvWrkDetl.getUnit(), null);
@@ -777,28 +919,29 @@
             inventoryDetail.setQcStatus(1);
             inventoryDetail.setStorageStatus(1);
             inventoryDetails.add(inventoryDetail);
+            transferOrderItem.setInventoryDetails(inventoryDetails);
             //娣诲姞閿�鍞鍗曞彿
             MesOrderReportParam.RecordCustomFieldBaseCO.CustomField customField = new MesOrderReportParam.RecordCustomFieldBaseCO.CustomField("workOrderCode__c", agvWrkDetl.getThreeCode().trim());
-            customFields.add(customField);
+            //customFields.add(customField);
+            recordCustomFieldBaseCO.setCustomFields(customField);
+            doHttpRequest(param, getMesTokenInfo(), "涓婃姤mes璋冩嫧淇℃伅", url, orderReportPath, null, "127.0.0.1");
         }
-
-        doHttpRequest(param, getMesTokenInfo(), "涓婃姤mes璋冩嫧淇℃伅", url, orderReportPath, null, "127.0.0.1");
 
     }
 
     //鑾峰彇mes token淇℃伅
     private Map<String, Object> getMesTokenInfo() {
-        Map<String, String> param = new HashMap<>();
-        param.put("appKey", appKey);
-        param.put("appSecret", appSecret);
+//        Map<String, String> param = new HashMap<>();
+//        param.put("appKey", appKey);
+//        param.put("appSecret", appSecret);
+//
+//        JSONObject jsonObject = doHttpRequest(param, null, "鑾峰彇MesToken", getTokenUrl, getTokenPath, null, "127.0.0.1");
+//
+//        Map<String, Object> headParam = new HashMap<>();
+//        headParam.put("X-AUTH", JSON.parseObject(jsonObject.get("data").toString()).get("appAccessToken").toString());
 
-        JSONObject jsonObject = doHttpRequest(param, null, "鑾峰彇MesToken", getTokenUrl, getTokenPath, null, "127.0.0.1");
-
-        Map<String, Object> headParam = new HashMap<>();
-        headParam.put("X-AUTH", JSON.parseObject(jsonObject.get("data").toString()).get("appAccessToken").toString());
-
-        return headParam;
-
+        //       return headParam;
+        return null;
     }
 
     //鏍规嵁妤煎眰榛樿鍑哄簱浠撲綅
@@ -819,50 +962,45 @@
         return null;
     }
 
-    private JSONObject doHttpRequest(Object requestParam, Map<String, Object> headParam, String namespace, String url, String path, String appkey, String ip) {
+    private void doHttpRequest(Object requestParam, Map<String, Object> headParam, String namespace, String url, String path, String appkey, String ip) {
+        //淇濊瘉涓婃姤琛�
+        ReportData reportData = new ReportData();
+        reportData.setReportJson(JSONObject.toJSONString(requestParam));
+        reportData.setMemo(namespace);
+        reportData.setCreateTime(new Date());
+        reportData.setReportType("MES");
+        reportDataService.insert(reportData);
 
-        String response = "";
-        boolean success = false;
 
-        try {
-            response = new HttpHandler.Builder()
-                    .setUri(url)
-                    .setPath(path)
-                    .setHeaders(headParam)
-                    .setJson(JSONObject.toJSONString(requestParam))
-                    .setHttps(true)
-                    .build()
-                    .doPost();
-            JSONObject jsonObject = JSON.parseObject(response);
-
-            if (Cools.isEmpty(jsonObject.get("code")) || Integer.parseInt(jsonObject.get("code").toString()) != 200) {
-                throw new CoolException(jsonObject.get("dsc").toString());
-            }
-            success = true;
-            return jsonObject;
-
-//            String succeed = jsonObject.get("succeed").toString();
+//        String response = "";
+//        boolean success = false;
 //
-//            int code = Cools.eq("0",succeed) ? 0 : 1;
-//            if(code != 200){
-//                throw new CoolException(jsonObject.get("dsc").toString());
+//        try {
+//            response = new HttpHandler.Builder().setUri(url).setPath(path).setTimeout(30, TimeUnit.SECONDS).setHeaders(headParam).setJson(JSONObject.toJSONString(requestParam)).setHttps(true).build().doPost();
+//            JSONObject jsonObject = JSON.parseObject(response);
+//
+//            if (Cools.isEmpty(jsonObject.get("code")) || Integer.parseInt(jsonObject.get("code").toString()) != 200) {
+//                log.info("mes鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭細" + jsonObject);
+//                //TODO 寮犺秴
+//                throw new CoolException("mes鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭�:" + jsonObject);
 //            }
 //            success = true;
-
-        } catch (Exception e) {
-            log.error(e.getMessage());
-            throw new CoolException(e.getMessage());
-        } finally {
-            apiLogService.save(
-                    namespace,
-                    url + path,
-                    appkey,
-                    ip,
-                    JSON.toJSONString(JSONObject.toJSONString(requestParam)),
-                    response,
-                    success
-            );
-        }
+//            return jsonObject;
+//
+////            String succeed = jsonObject.get("succeed").toString();
+////
+////            int code = Cools.eq("0",succeed) ? 0 : 1;
+////            if(code != 200){
+////                throw new CoolException(jsonObject.get("dsc").toString());
+////            }
+////            success = true;
+//
+//        } catch (Exception e) {
+//            log.error(e.getMessage());
+//            throw new CoolException(e.getMessage());
+//        } finally {
+//            apiLogService.save(namespace, url + path, appkey, ip, JSON.toJSONString(JSONObject.toJSONString(requestParam)), response, success);
+//        }
 
     }
 

--
Gitblit v1.9.1