#
Junjie
2024-06-16 fd60f09fcee8fa861a851254cab41e65469d05c0
#
2个文件已修改
16 ■■■■■ 已修改文件
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TestController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TestController.java
@@ -64,14 +64,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());
@@ -99,7 +99,7 @@
                param.put("FromDanCode", orderNo);
                param.put("Data", mats);
                String response = null;
                String response = "";
                try {
                    response = new HttpHandler.Builder()
                            .setUri(ERP_URL)
@@ -125,6 +125,8 @@
                    operateLog.setResponse(response);
                    operateLog.setCreateTime(new Date());
                    operateLog.setSystem("WMS");
                    operateLog.setUserId(9527L);
                    operateLog.setIp("127.0.0.1");
                    operateLogService.save(operateLog);
                }
            }
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());
@@ -153,7 +153,7 @@
                    param.put("FromDanCode", orderNo);
                    param.put("Data", mats);
                    String response = null;
                    String response = "";
                    try {
                        response = new HttpHandler.Builder()
                                .setUri(ERP_URL)
@@ -182,6 +182,8 @@
                        operateLog.setResponse(response);
                        operateLog.setCreateTime(new Date());
                        operateLog.setSystem("WMS");
                        operateLog.setUserId(9527L);
                        operateLog.setIp("127.0.0.1");
                        operateLogService.save(operateLog);
                    }
                }