修改

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

@@ -193,7 +193,7 @@ public class WmspOutboundResultController extends BaseRESTfulController {
      *   list：出库单实绩
      * */
     @Transactional
-    @PostMapping(value = "/insertwmspOutboundScanResult6")
+    @PostMapping(value = "/insertwmspOutboundScanResult")
     public synchronized RESTfulResult insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map){
         //判断物资是否满足要求,目前一下三种不做处理的判断
         //获取装卸工扫描吊牌结果   HRB400-14-21706854-9-3049-280-20211001015115-7a63cd87a4095e7f-08010103010100003-4
@@ -202,17 +202,25 @@ public class WmspOutboundResultController extends BaseRESTfulController {
         BigDecimal resultId = new BigDecimal(map.get("resultId").toString());
         //物资唯一编码
         String MaterialOnlyCode=subResultMaterial.split("-")[7];
+
+
         //判断物质是否已经被扫描
         int isScan = wmspOutboundResultService.ExistScanResult(subResultMaterial);
         //判断物资是否是需要出库的物资,需要出库物资数量不等于0,通过物资唯一编码和出库实绩
         Integer materialNumber = wmspOutboundResultMaterialService.isOutboundResultMaterial(MaterialOnlyCode,resultId);
         //判断物资是否数量已满
         int scanCount = wmspOutboundScanResultService.getScanCount(MaterialOnlyCode,resultId);
-        if(isScan==0&&(materialNumber!=null&&materialNumber!=0)&&(materialNumber>scanCount)){
+
+        //根据物资id查询相对应的入库实绩ID，并将其赋值给相对应的入库扫描实绩表,判断是否入库
+        List<Map<String, Object>> list = wmspInboundScanResultMapper.getInboundResultIdByMaterial(subResultMaterial);
+
+        if(list.size()>0&&isScan==0&&(materialNumber!=null&&materialNumber!=0)&&(materialNumber>scanCount)){
             //创建扫描实绩
             //通过装卸工工号查询装卸工Id
             BigDecimal personnelId = wmspOutboundResultService.getPersonnelIdByJobnumber(map.get("personnelJobNumber").toString());
-            int status= wmspOutboundResultService.createOutboundScanResult(subResultMaterial,personnelId,resultId);
+            //默认以获取到的第一个值作为入库实绩Id
+            Map<String, Object> map1 = list.get(0);
+            int status= wmspOutboundResultService.createOutboundScanResult(subResultMaterial,personnelId,resultId,(BigDecimal)map1.get("inboundResultId"));
         }
 
         //返回值展示结果

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

@@ -4,6 +4,7 @@ import com.steerinfo.dil.model.WmspOutboundScanResult;
 import com.steerinfo.dil.vo.OutBoundMaterialDetailedInfo;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -16,7 +17,7 @@ public interface WmspOutboundScanResultMapper extends IBaseMapper<WmspOutboundSc
     //通过物资唯一编码找寻物资名称、规格型号、物资唯一编码和物资质检是否合格
     List<Map<String, Object>> getRmsMaterial (String materialOnlyCode);
 
-    List<OutBoundMaterialDetailedInfo> getOutBoundMaterialDetailedInfos(List<String> onlyCodes);
+    List<OutBoundMaterialDetailedInfo> getOutBoundMaterialDetailedInfos(@Param("onlyCodes") List<String> onlyCodes);
 
     List<String> getResultStrs(BigDecimal resultId);
     //通过物资唯一编码查询钢材物资唯一id

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

@@ -81,7 +81,7 @@ public interface IWmspOutboundResultService {
 
     OutBoundDetailed getInitOutboundScanResultMaterialInfo(BigDecimal resultId);
 
-    int createOutboundScanResult(String subResultMaterial, BigDecimal personnelId, BigDecimal resultId);
+    int createOutboundScanResult(String subResultMaterial, BigDecimal personnelId, BigDecimal resultId,BigDecimal inboundResultId);
     //删除实时库存
     int deleteGridMaterial(String materialOnlyCode);
 }

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

@@ -335,7 +335,7 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
                     }
                 }
                 //统计完数量赋值
-                typeDetailedInfo.setNumber(count);
+                typeDetailedInfo.setScanCodeNumber(count);
             }
             outBoundDetailed.setOutBoundMaterialDetailedInfos(outBoundMaterialDetailedInfos);
         }
@@ -344,7 +344,7 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
     }
 
     @Override
-    public int createOutboundScanResult(String resultMaterial, BigDecimal personnelId, BigDecimal resultId) {
+    public int createOutboundScanResult(String resultMaterial, BigDecimal personnelId, BigDecimal resultId,BigDecimal inboundResultId) {
         //截取扫描结果，得到物资唯一编码
         String[] split = resultMaterial.split("-");
         //唯一编码
@@ -361,15 +361,8 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
         int seq_wmspOutboundScanResult = commonSeq.getSeqNumber("seq__WMSP_OUTBOUND_SCAN_RESULT");
         //插入主键id
         wmspOutboundScanResult.setResultId(new BigDecimal(seq_wmspOutboundScanResult));
-        //根据物资id查询相对应的入库实绩ID，并将其赋值给相对应的入库扫描实绩表
-        List<Map<String, Object>> list = wmspInboundScanResultMapper.getInboundResultIdByMaterial(resultMaterial);
-        //默认以获取到的第一个值作为入库实绩Id
-        Map<String, Object> map1 = list.get(0);
-        //如果等于0说明该物资没有录入系统
-        if (list.size() == 0) {
-
-        }
-        wmspOutboundScanResult.setInboundResultId((BigDecimal) map1.get("inboundResultId"));
+        //入库实绩
+        wmspOutboundScanResult.setInboundResultId(inboundResultId);
         //插入出库实绩ID
         wmspOutboundScanResult.setOutboundResultId(resultId);
         //插入装卸工Id

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

@@ -73,7 +73,10 @@ public class WmspOutboundScanResultServiceImpl implements IWmspOutboundScanResul
     @Override
     public int getScanCount(String onlyCode, BigDecimal resultId) {
         List<String> onlyCodes=getOutBoundScanResultOnlyCodes(resultId);
-        Integer scanCount= rmsMaterialSteelService.getScanCount(onlyCode,onlyCodes);
+        Integer scanCount=0;
+        if (onlyCodes!=null&&onlyCodes.size()>0){
+            scanCount= rmsMaterialSteelService.getScanCount(onlyCode,onlyCodes);
+        }
         return scanCount;
     }
 

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/wms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8