修改

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

@@ -70,16 +70,18 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
         //判断条件是查询扫描实绩判断是否已经存在改唯一标识码并且扫码人是否是自己
         System.out.println(map.get("resultMaterial"));
         //订单类型为倒库，直接扫码所有并返回数据
-        int orderType=wmsInboundScanResultService.getOrderTypeByNum((String)map.get("resultMaterial"));
-        if(orderType == 25){
+        Integer orderType=wmsInboundScanResultService.getOrderTypeByNum((String)map.get("resultMaterial"));
+        if(orderType!=null && orderType == 25){
             //根据出库数据查询入库扫码实绩
             List<Map<String,Object>> inboundOld= wmsInboundScanResultService.findInboundScanResult((String)map.get("resultMaterial"));
             //批量新增扫码实绩
-            if(inboundOld!=null || inboundOld.size()>0){
+            if(inboundOld!=null || inboundOld.size()>0 || inboundOld.get(0)!=null){
                 wmsInboundScanResultService.createInboundScanResultByFind(inboundOld,map);
             }
-            else
+            else{
                 System.out.println("物资暂未出库，请先出库再入库!");
+                return null;
+            }
             //返回新建的扫码实绩数据
             List<Map<String,Object>> mapList= wmsInboundScanResultService.noIssueScanResultList(map.get("userName").toString());
             return  success(mapList);

src/main/java/com/steerinfo/dil/mapper/WmspInboundScanResultMapper.java

@@ -136,7 +136,7 @@ public interface WmspInboundScanResultMapper extends IBaseMapper<WmspInboundScan
     int isExistInboundTwo(String resultMaterial);
 
     //根据运输订单号取得订单类型
-    int getOrderTypeByNum(String orderNumber);
+    Integer getOrderTypeByNum(String orderNumber);
 
     //根据入库实绩id查询运输订单id和类型
     Map<String, Object> getOrderTypeByInboundId(String resultId);

src/main/java/com/steerinfo/dil/service/IWmsInboundScanResultService.java

@@ -134,7 +134,7 @@ public interface IWmsInboundScanResultService {
     int isExistInboundScanResult(String substring);
 
     //根据运输订单号取得订单类型
-    int getOrderTypeByNum(String orderNum);
+    Integer getOrderTypeByNum(String orderNum);
 
     //根据入库实绩id查询运输订单id和类型
     Map<String, Object> getOrderTypeByInboundId(String resultId);

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

@@ -322,7 +322,7 @@ public class WmsInboundScanResultServiceImpl implements IWmsInboundScanResultSer
         String userName=map.get("userName").toString();
         for(Map<String,Object> temp:list){
             if(temp==null || temp.get("shiftOrder")==null || temp.get("resultMaterial")==null){
-                throw new Exception("存在空值，终止");
+                throw new Exception("查询结果存在空值，终止新增扫码实绩，并回滚");
             }
             //创建入库扫描实绩、并且给对象赋值
             WmspInboundScanResult wmspInboundScanResult=new WmspInboundScanResult();
@@ -447,7 +447,7 @@ public class WmsInboundScanResultServiceImpl implements IWmsInboundScanResultSer
     }
 
     @Override
-    public int getOrderTypeByNum(String orderNumber) {
+    public Integer getOrderTypeByNum(String orderNumber) {
         return wmspInboundScanResultMapper.getOrderTypeByNum(orderNumber);
     }