#
cp
2024-09-18 c6ff506917d173b2cf90948d84a77f86b847ab89
#
3个文件已修改
14 ■■■■ 已修改文件
zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/OrderSyncHandler.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml
@@ -69,7 +69,7 @@
    <select id="selectComplete" resultMap="BaseResultMap">
        select top 5 *
        from man_order
        from wms_order
        where 1=1
          and settle = 4
          and status = 1
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/OrderSyncHandler.java
@@ -88,7 +88,15 @@
        param.put("DanCode", orderNo);
        param.put("Data", mats);
        ReturnT<String> mesReturn = new PostMesDataUtils().getMesData("上报MES", ERP_URL, ERP_REPORT, param);
        if (mesReturn.getCode()!=200){
            order.setSettle(7L);
            order.setCreateTime(new Date());
            orderService.updateById(order);
        } else {
            order.setSettle(6L);
            order.setCreateTime(new Date());
            orderService.updateById(order);
        }
        return mesReturn;
    }
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
@@ -40,7 +40,7 @@
                } else {
                    //上报失败
                    log.error("请求接口失败!!!url:{};request:{};response:{}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
                    throw new CoolException("上报"+name);
//                    throw new CoolException("上报"+name);
                }
                if (jsonObject.getInteger("code").equals(200) || jsonObject.getInteger("Code").equals(200)) {