出厂扫码

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

@@ -257,6 +257,7 @@ public class WmspOutboundResultController extends BaseRESTfulController {
      * 返回值：
      *   list：出库单实绩
      * */
+    @Transactional
     @PostMapping(value = "/insertwmspOutboundScanResult")
     public synchronized RESTfulResult insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map){
         //获取装卸工扫描吊牌结果                                                           HRB400-14-21706854-9-3049-280-20211001015115-7a63cd87a4095e7f-08010103010100003-4

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

@@ -169,19 +169,21 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
     @Override
     public int outbountResultToSuccess(Integer resultId) {
         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();
         if (orderMaterialNumber.intValue() == outboundMaterialNumber) {
-            // 设置出库实绩为成功
+            // 设置出库实绩为成功、将出库实绩改完已经出库
             WmspOutboundResult wmspOutboundResult = wmspOutboundResultMapper.selectByPrimaryKey(new BigDecimal(resultId));
             wmspOutboundResult.setResultStatus(new BigDecimal(1));
             result += wmspOutboundResultMapper.updateByPrimaryKeySelective(wmspOutboundResult);
             // 调用装货
             BigDecimal orderId = wmspOutboundResult.getBillLadingId();
             //result += tmstruckFeign.addSaleLoadResult(orderId.intValue());
-            // 修改实时库存（逻辑删除）
+            // 修改实时库存（逻辑删除） grid
             BigDecimal materialId = wmspOutboundResult.getMaterialId();
             result += wmspOutboundResultMapper.updateGrid(materialId);
         }

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

@@ -715,7 +715,7 @@
   </select>
 
   <select id="getOutBoundDetailedInfo" parameterType="java.math.BigDecimal" resultType="java.util.LinkedHashMap">
-    select w_outbound.RESULT_ID "resultId",
+    select distinct w_outbound.RESULT_ID "resultId",
            w_outbound.RESULT_NUMBER "resultNumber",
            w_outbound.RESULT_OUTBOUND_TYPE "resultOutboundType",
            r_capacity.CAPACITY_NUMBER "capacityNumber",
@@ -825,7 +825,7 @@
 
   <!--  通过唯一编码获取物资名称、计量单位、垛位-->
   <select id="getOtherInfoByMaterialOnlyCode" parameterType="String" resultType="java.util.Map">
-    select r_material.MATERIAL_NAME "materialName",
+    select distinct r_material.MATERIAL_NAME "materialName",
            r_unit.UNIT_OF_MEASURE_NAME "unitOfMeasureName",
            r_stacking.STACKING_NO "stackingNo"
     from RMS_MATERIAL_STEEL material_steel