修改

src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -347,7 +347,7 @@ public class UniversalController extends BaseRESTfulController {
         if(type != null){
             mapValue.put("type", type);
         }
-        if(index != null){
+        if(index != null && !"".equals(index) && !"null".equals(index)){
             mapValue.put("index", index);
         }
         PageHelper.startPage(pageNum, pageSize);
@@ -537,7 +537,7 @@ public class UniversalController extends BaseRESTfulController {
         if(mapValue == null) {
             mapValue = new HashMap<>();
         }
-        if(index != null){
+        if(index != null && !"".equals(index) && !"null".equals(index)){
             mapValue.put("index", index);
         }
         PageHelper.startPage(pageNum, pageSize);

src/main/java/com/steerinfo/dil/controller/WMSController.java

@@ -1116,5 +1116,10 @@ public class WMSController extends BaseRESTfulController {
                                              @RequestParam(value = "quantity") Integer quantity) {
         return wmsFeign.deleteInboundMaterial(warehouseId,materialCode,materialSpecification,materialModel,quantity);
     }
+
+    @PostMapping("/recordScanResult")
+    public Map<String,Object> recordScanResult(@RequestBody Map<String,Object> map) {
+        return wmsFeign.recordScanResult(map);
+    }
 }
 

src/main/java/com/steerinfo/dil/feign/WMSFeign.java

@@ -943,4 +943,8 @@ public interface WMSFeign {
                                               @RequestParam("materialSpecification") String materialSpecification,
                                               @RequestParam("materialModel") String materialModel,
                                               @RequestParam("quantity") Integer quantity);
+
+    @PostMapping("/api/v1/wms/inboundScanResult/recordScanResult")
+    Map<String, Object> recordScanResult(@RequestBody Map<String, Object> map);
+
 }

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -242,48 +242,48 @@ public class UniversalServiceImpl implements UniversalService {
      */
     //@Scheduled(cron = "0 0,5 8 * * ?")
     public void closePassedOrder() {
-        List<Map<String,Object>> passedOrderList = universalMapper.findPassedOrder();
-        System.out.println("关闭的未出厂过期订单如下：<" + passedOrderList + ">");
-        int result=0;
-        //int result = universalMapper.closePassedOrder();
-        try {
-            if (passedOrderList.isEmpty()){
-
-            }else {
-                for (Map<String, Object> map : passedOrderList) {
-                    BigDecimal orderId = (BigDecimal) map.get("orderId");
-                    //分两种情况关单
-                    //净重为0状态设为2，不为零设为7
-                    BigDecimal bigDecimal = universalMapper.sumNetWeight(orderId);
-                    if (bigDecimal.compareTo(BigDecimal.ZERO)!=0){
-                        result+=universalMapper.updateStatusTwo(orderId);
-                    }else {
-                        result+=universalMapper.updateStatusSeven(orderId);
-                    }
-                   /* BigDecimal capacityIdS=universalMapper.queueSingle(orderId);*/
-                    /*if (capacityIdS !=null){
-                        //删除单拼
-                        universalMapper.delectQueueS(capacityIdS);
-                    }*/
-                    /*//查询多拼的数据
-                    BigDecimal capacityIdM =universalMapper.queueMore(orderId);
-                    if (capacityIdM !=null){
-                        //删除多拼
-                        universalMapper.delectQueueM(capacityIdM);
-                    }
-                    //查询单拼的数据
-                    BigDecimal capacityIdS=universalMapper.queueSingle(orderId);
-                    if (capacityIdS !=null){
-                        //删除单拼
-                        universalMapper.delectQueueS(capacityIdS);
-                    }*/
-                }
-            }
-
-        }catch (Exception e){
-
-        }
-        System.out.println("订单关闭数为：" + result);
+        //List<Map<String,Object>> passedOrderList = universalMapper.findPassedOrder();
+        //System.out.println("关闭的未出厂过期订单如下：<" + passedOrderList + ">");
+        //int result=0;
+        ////int result = universalMapper.closePassedOrder();
+        //try {
+        //    if (passedOrderList.isEmpty()){
+        //
+        //    }else {
+        //        for (Map<String, Object> map : passedOrderList) {
+        //            BigDecimal orderId = (BigDecimal) map.get("orderId");
+        //            //分两种情况关单
+        //            //净重为0状态设为2，不为零设为7
+        //            BigDecimal bigDecimal = universalMapper.sumNetWeight(orderId);
+        //            if (bigDecimal.compareTo(BigDecimal.ZERO)!=0){
+        //                result+=universalMapper.updateStatusTwo(orderId);
+        //            }else {
+        //                result+=universalMapper.updateStatusSeven(orderId);
+        //            }
+        //           /* BigDecimal capacityIdS=universalMapper.queueSingle(orderId);*/
+        //            /*if (capacityIdS !=null){
+        //                //删除单拼
+        //                universalMapper.delectQueueS(capacityIdS);
+        //            }*/
+        //            /*//查询多拼的数据
+        //            BigDecimal capacityIdM =universalMapper.queueMore(orderId);
+        //            if (capacityIdM !=null){
+        //                //删除多拼
+        //                universalMapper.delectQueueM(capacityIdM);
+        //            }
+        //            //查询单拼的数据
+        //            BigDecimal capacityIdS=universalMapper.queueSingle(orderId);
+        //            if (capacityIdS !=null){
+        //                //删除单拼
+        //                universalMapper.delectQueueS(capacityIdS);
+        //            }*/
+        //        }
+        //    }
+        //
+        //}catch (Exception e){
+        //
+        //}
+        //System.out.println("订单关闭数为：" + result);
         //return 1;
     }