tijiao

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

@@ -190,6 +190,12 @@ public class WmspOutboundResultController extends BaseRESTfulController {
 
         //判断物质是否已经被扫描
         int isScan = wmspOutboundResultService.ExistScanResult(subResultMaterial);
+        //根据物资id查询相对应的入库实绩ID，并将其赋值给相对应的入库扫描实绩表,判断是否入库
+        List<Map<String, Object>> list = wmspInboundScanResultMapper.getInboundResultIdByMaterial(subResultMaterial);
+        if (list.size()==0){
+            //没有入库
+            return failed(-2);
+        }
         //判断物资是否是需要出库的物资,需要出库物资数量不等于0,通过物资唯一编码和出库实绩
         Map<String,Object> materialMap = wmspOutboundResultMaterialService.isOutboundResultMaterial(MaterialOnlyCode,resultId);
         if (materialMap==null){
@@ -200,8 +206,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)){
             //创建扫描实绩
@@ -254,7 +259,6 @@ public class WmspOutboundResultController extends BaseRESTfulController {
         int scanCount = wmspOutboundResultService.ExistScanResult(subResultMaterial);
         ///如果没有被扫描
         if(scanCount==0){
-
             //wmspOutboundResultService.getOutBoundId(resultNumber);
             //获取装卸工工号
             String personnelJobNumber = (String) map.get("personnelJobNumber");
@@ -460,6 +464,7 @@ public class WmspOutboundResultController extends BaseRESTfulController {
         }
         return failed(result);
     }
+
     @ApiOperation(value = "出库(非0:成功,0:失败)")
     @PostMapping("/outbountResultToSuccess2")
     public RESTfulResult outbountResultToSuccess(@RequestParam Integer resultId) {