liyg 2 rokov pred
rodič
commit
7ddf1bb8a6

+ 2 - 1
src/main/java/com/steerinfo/dil/controller/WmsInboundScanResultController.java

@@ -75,8 +75,9 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
             //根据出库数据查询入库扫码实绩
             List<Map<String,Object>> inboundOld= wmsInboundScanResultService.findInboundScanResult((String)map.get("resultMaterial"));
             //批量新增扫码实绩
-            if(inboundOld!=null || inboundOld.size()>0)
+            if(inboundOld!=null || inboundOld.size()>0){
                 wmsInboundScanResultService.createInboundScanResultByFind(inboundOld,map);
+            }
             else
                 System.out.println("物资暂未出库,请先出库再入库!");
             //返回新建的扫码实绩数据

+ 3 - 0
src/main/java/com/steerinfo/dil/service/impl/WmsInboundScanResultServiceImpl.java

@@ -321,6 +321,9 @@ public class WmsInboundScanResultServiceImpl implements IWmsInboundScanResultSer
         List<WmspInboundScanResult> results=new ArrayList<>();
         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("存在空值,终止");
+            }
             //创建入库扫描实绩、并且给对象赋值
             WmspInboundScanResult wmspInboundScanResult=new WmspInboundScanResult();
             //设置自增主键

+ 1 - 1
src/main/resources/application-prod.yml

@@ -28,4 +28,4 @@ piction:
   #path: C:\Users\24390\Desktop\work\a
    path: /shared
 server:
-  port: 8095
+  port: 8093

+ 1 - 1
src/main/resources/com/steerinfo/dil/mapper/WmspInboundScanResultMapper.xml

@@ -1097,7 +1097,7 @@ where wisr.result_id = #{stackResultId}
     </select>
     <select id="findInboundScanResult" resultType="java.util.Map">
         --倒库根据出库实绩查询入库扫码数据
-        select OO.ORDER_NUMBER "orderNumber",
+        select
                WISR.RESULT_MATERIAL "resultMaterial",
                WISR.SHIFT_ORDER "shiftOrder"
         from OMSTRUCK_ORDER OO