1.odn出货(新),展示修改

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -103,9 +103,9 @@ public class LiteOrderCache {
         List<LiteOrder> unEndOutInfoList = liteOrderManager.findUnEndOrdersList();
         List<LiteOrder> unEndOutInfoList = liteOrderManager.findUnEndOrdersList();
         long now = System.currentTimeMillis();
         long now = System.currentTimeMillis();
         for (LiteOrder order : unEndOutInfoList) {
         for (LiteOrder order : unEndOutInfoList) {
-            if (now - order.getCreateDate().getTime() > 7 * 24 * 60 * 60 * 1000) {
+            if (now - order.getCreateDate().getTime() > 30 * 24 * 60 * 60 * 1000) {
                 //7天前的需求单,关闭,并解绑
                 //7天前的需求单,关闭,并解绑
-                log.info("需求单 =[" + order.getOrderNo() + "]为7天前,关闭并解绑工单");
+                log.info("需求单 =[" + order.getOrderNo() + "]为30天前,关闭并解绑工单");
                 closeOrder(order.getOrderNo());
                 closeOrder(order.getOrderNo());
 
 
             } else {
             } else {

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/OdnCheckOutNewController.java

@@ -61,14 +61,8 @@ public class OdnCheckOutNewController {
         if (StringUtils.isBlank(odn)) {
         if (StringUtils.isBlank(odn)) {
             return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"odn"});
             return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"odn"});
         }
         }
-        LiteOrder liteOrder = liteOrderCache.getLiteOrder(odn);
-        if (liteOrder == null) {
-            liteOrder = liteOrderManager.findByOrderNo(odn);
-        }
-        if (liteOrder == null) {
-            liteOrder = odnInfoToLiteOrder(odn);
-        }
-        return ResultBean.newOkResult(liteOrder);
+        List<FetchShipmentInfoResult> resultList = LuxsanApi.fetchShipmentInfo(new FetchShipmentInfoRequest(CommonUtil.plantCode, odn));
+        return ResultBean.newOkResult(FetchShipmentInfoDto.convertFetchShipmentInfoDto(resultList));
     }
     }
 
 
     @ApiOperation("获取odn要出库的箱子")
     @ApiOperation("获取odn要出库的箱子")