修改出库

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

@@ -190,6 +190,13 @@ public class WmspOutboundResultController extends BaseRESTfulController {
 
         //判断物质是否已经被扫描
         int isScan = wmspOutboundResultService.ExistScanResult(subResultMaterial);
+
+        //根据物资id查询相对应的入库实绩ID，并将其赋值给相对应的入库扫描实绩表,判断是否入库
+        List<Map<String, Object>> list = wmspInboundScanResultMapper.getInboundResultIdByMaterial(subResultMaterial);
+        if (list==null||list.size()==0){
+            //没有入库
+            return failed(-2);
+        }
         //判断物资是否是需要出库的物资,需要出库物资数量不等于0,通过物资唯一编码和出库实绩
         Map<String,Object> materialMap = wmspOutboundResultMaterialService.isOutboundResultMaterial(MaterialOnlyCode,resultId);
         if (materialMap==null){
@@ -200,8 +207,7 @@ public class WmspOutboundResultController extends BaseRESTfulController {
         //获得已经扫描的物质数量
         int scanCount = wmspOutboundScanResultService.getScanCount(MaterialOnlyCode,resultId);
 
-        //根据物资id查询相对应的入库实绩ID，并将其赋值给相对应的入库扫描实绩表,判断是否入库
-        List<Map<String, Object>> list = wmspInboundScanResultMapper.getInboundResultIdByMaterial(subResultMaterial);
+
 
         if(list.size()>0&&isScan==0&&(materialNumber!=null&&materialNumber!=0)&&(materialNumber>scanCount)){
             //创建扫描实绩