#
cp
2024-09-13 2a2d6b0c071bf744a777991efb35f5503b68598a
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java
@@ -118,14 +118,14 @@
                }
            }
            if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 53 || wrkMast.getWrkSts() == 200) {
            if (!wrkDetlsKeyOrder.isEmpty()) {
                //上报念初ERP   【 上报三方平台 】
                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
                String nowFormat = dateFormat.format(new Date());
                ArrayList<LinkedHashMap<String, Object>> mats = new ArrayList<>();
                String orderNo = "";
                for (WrkDetl wrkDetl : wrkDetls) {
                for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
                    orderNo = wrkDetl.getOrderNo();
                    LinkedHashMap<String, Object> mat = new LinkedHashMap<>();
                    mat.put("GoodsCode", wrkDetl.getMatnr());
@@ -148,12 +148,12 @@
                if (order != null) {
                    LinkedHashMap<String, Object> param = new LinkedHashMap<>();
                    param.put("Login", ERP_LOGIN);
                    param.put("DanType", order.getDocType$());
                    param.put("DanType", order.getDocType$()+"SH");
                    param.put("Date", nowFormat);
                    param.put("FromDanCode", orderNo);
                    param.put("DanCode", orderNo);
                    param.put("Data", mats);
                    String response = null;
                    String response = "";
                    try {
                        response = new HttpHandler.Builder()
                                .setUri(ERP_URL)
@@ -182,7 +182,19 @@
                        operateLog.setResponse(response);
                        operateLog.setCreateTime(new Date());
                        operateLog.setSystem("WMS");
                        operateLog.setUserId(9527L);
                        operateLog.setIp("127.0.0.1");
                        operateLogService.save(operateLog);
                        //记录上报数据
                        OperateLog operateLog1 = new OperateLog();
                        operateLog1.setAction("上报ERP," + ERP_URL + ERP_REPORT);
                        operateLog1.setRequest(param.toString());
                        operateLog1.setResponse(response);
                        operateLog1.setCreateTime(new Date());
                        operateLog1.setSystem("WMS");
                        operateLog1.setUserId(9527L);
                        operateLog1.setIp("127.0.0.1");
                        operateLogService.save(operateLog1);
                    }
                }
            }