2.16

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

@@ -193,7 +193,7 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
         int result = 0;
         //获得扫码出库实绩
         List<Map<String,Object>> materialNumberList = wmspOutboundResultMapper.getScanMaterialNumber(new BigDecimal(resultId));
-        //获得运输订单的物质数量
+        //获得运输订单的物资数量
         List<Map<String,Object>> orderMaterialNumberList = wmspOutboundResultMapper.getOunboundOrderNumber(new BigDecimal(resultId));
         BigDecimal orderMaterialNumber = (BigDecimal) orderMaterialNumberList.get(0).get("orderMaterialNumber");
         int outboundMaterialNumber = materialNumberList.size();
@@ -217,14 +217,14 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
     }
 
     /**
-     * 判断物质是否已经都已经被扫描
+     * 判断物资是否已经都已经被扫描
      * @param resultId
      * @return
      */
     @Override
     public int EqualMaterialsNumber(BigDecimal resultId) {
         int EqualMaterialsNumber = 0;
-        //获得被扫描物质
+        //获得被扫描物资
         List<Map<String,Object>> materialNumberList = wmspOutboundResultMapper.getScanMaterialNumber(resultId);
         //获得运单中间表的物资件数
         List<Map<String,Object>> orderMaterialNumberList = wmspOutboundResultMapper.getOunboundOrderNumber(resultId);
@@ -394,9 +394,9 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
                 if(date==null){
                     //将这些物资钢材id进行逻辑删除
                     i += wmspGridMaterialMapper.updateByMaterialId(materialSteelId,new Date());
-                    //判断物质是否是预留物质
+                    //判断物资是否是预留物资
                     int isReserve= wmsInboundResultService.getTypeMaterilaId(materialSteelId);
-                    //如果是预留物质
+                    //如果是预留物资
                     if (isReserve>0){
                         //将最新的一条真实库数据，状态改为预留状态状态，代替预留库存
                         int status2= wmsInboundResultService.updateStatusByMaterialId(materialSteelId);
@@ -418,7 +418,7 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
 
     @Override
     public int sureOutbount(BigDecimal resultId) {
-        //查询提货单，没有确定出库物质类型集合
+        //查询提货单，没有确定出库物资类型集合
         List<OutBoundTypeDetailedInfo> outBoundTypeDetailedInfos= wmspOutboundResultMaterialService.getOutBoundTypeDetailedInfo(resultId,1);
         //查询出库扫描实绩，并且在实时库存没有删除的出库扫描实绩
 
@@ -430,9 +430,10 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
         if (onlycodes.size()>0){
             //查询出已经扫码的物资信息
             List<OutBoundMaterialDetailedInfo> outBoundMaterialDetailedInfos= wmspOutboundScanResultService.getOutBoundMaterialDetailedInfos(onlycodes,1);
+
             //统计出已经扫码的物资数量
             for (OutBoundTypeDetailedInfo typeDetailedInfo :outBoundTypeDetailedInfos){
-                //这一个类型的物质
+                //这一个类型的物资
                 List<OutBoundMaterialDetailedInfo> thisMaterialDetailedInfos=new  ArrayList<>();
                 int count=0;
                 for (OutBoundMaterialDetailedInfo outBoundMaterialDetailedInfo: outBoundMaterialDetailedInfos){
@@ -443,13 +444,13 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
                 }
                 //统计完数量赋值
                 typeDetailedInfo.setScanCodeNumber(count);
-                //统计，并且判断是否有某种物质已经扫满了
+                //统计，并且判断是否有某种物资已经扫满了
                 if (typeDetailedInfo.getNumber()==typeDetailedInfo.getScanCodeNumber()){
-                    //如果有某一种物质扫满了，需要将这一类物质，在实时库存删除，并且修改出库物质类型状态，发送计量委托
+                    //如果有某一种物资扫满了，需要将这一类物资，在实时库存删除，并且修改出库物资类型状态，发送计量委托
                     int cunt= wmspGridMaterialService.deleteGridMaterial(thisMaterialDetailedInfos);
                     cunt2=wmspOutboundResultMaterialService.updateStatus(typeDetailedInfo.getResultMaterialId());
                 }
-                //如果所以物质都已经结束，需要改变提货单状态
+                //如果所以物资都已经结束，需要改变提货单状态
                 if (outBoundTypeDetailedInfos==null||outBoundTypeDetailedInfos.size()-cunt2==0){
                     int cunt3=wmspOutboundResultMapper.updateStatus(resultId);
                     //返回结果

src/main/resources/bootstrap.yml

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

src/main/resources/com/steerinfo/dil/mapper/WmspGridMaterialMapper.xml

@@ -769,6 +769,6 @@
     <foreach collection="thisMaterialDetailedInfos" item="item" open="(" separator="or" close=")">
       #{item.materialSteelId}
     </foreach>
-    #{materialSteelId}
+
   </delete>
 </mapper>

src/main/resources/com/steerinfo/dil/mapper/WmspOutboundScanResultMapper.xml

@@ -448,7 +448,7 @@
   
   <select id="getOutBoundMaterialDetailedInfos"  resultType="com.steerinfo.dil.vo.OutBoundMaterialDetailedInfo">
      select
-      rms.material_id "materialSteelId",
+      rms.MATERIAL_STEEL_ID "materialSteelId",
       rms.MATERIAL_ONLY_CODE "onlyCode",
       RM.material_Id "materialId",
       RM.MATERIAL_CODE "materialCode",