行车工bug修改

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

@@ -280,4 +280,13 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
         return setString;
     }
 
+//    根据index找到对应的成品并改变其入库状态
+    @ApiOperation(value="展示垛位")
+    @PostMapping("/changeInboundIscomplete")
+    public RESTfulResult changeInboundIscomplete(@RequestBody(required = false) Map<String,Object>map){
+        Integer stackResultId1= (Integer) map.get("stackResultId");
+        BigDecimal stackResultId=new BigDecimal(stackResultId1);
+        int result =wmsInboundScanResultService.changeInboundIscomplete(stackResultId);
+        return success(result);
+    }
 }

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

@@ -121,4 +121,5 @@ public interface WmspInboundScanResultMapper extends IBaseMapper<WmspInboundScan
     BigDecimal getScanedNumber(String userId);
 
     List<Map<String, Object>> noIssueScanResultList(String userName);
+
 }

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

@@ -119,4 +119,6 @@ public interface IWmsInboundScanResultService {
     Map<String, Object> createInboundScanResultByResultMaterial(Integer scanedCount,String userId,String resultMaterial) throws ParseException;
 
     List<Map<String, Object>> noIssueScanResultList(String userName);
+//    根据index找到对应的成品并改变其入库状态
+    int changeInboundIscomplete(BigDecimal index);
 }

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

@@ -3,7 +3,9 @@ package com.steerinfo.dil.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.steerinfo.dil.mapper.WmspInboundScanResultMapper;
+import com.steerinfo.dil.mapper.WmspInboundStackResultMapper;
 import com.steerinfo.dil.model.WmspInboundScanResult;
+import com.steerinfo.dil.model.WmspInboundStackResult;
 import com.steerinfo.dil.service.IRmsMaterialSteelService;
 import com.steerinfo.dil.service.IWmsInboundScanResultService;
 import com.steerinfo.dil.service.IWmspInboundGroupService;
@@ -27,6 +29,8 @@ public class WmsInboundScanResultServiceImpl implements IWmsInboundScanResultSer
     @Autowired
     private WmspInboundScanResultMapper wmspInboundScanResultMapper;
     @Autowired
+    private WmspInboundStackResultMapper wmspInboundStackResultMapper;
+    @Autowired
     private IWmspInboundGroupService wmspInboundGroupService;
     @Autowired
     private IRmsMaterialSteelService rmsMaterialSteelService;
@@ -311,4 +315,13 @@ public class WmsInboundScanResultServiceImpl implements IWmsInboundScanResultSer
     public List<Map<String, Object>> noIssueScanResultList(String userName) {
         return wmspInboundScanResultMapper.noIssueScanResultList(userName);
     }
+
+    @Override
+    public int changeInboundIscomplete(BigDecimal stackResultId) {
+//        根据stackResultId找到对应的成品并修改其状态
+        WmspInboundStackResult wmspInboundStackResult =new WmspInboundStackResult();
+        wmspInboundStackResult.setResultId(stackResultId);
+        wmspInboundStackResult.setStackingStatus(new BigDecimal(1));
+        return wmspInboundStackResultMapper.updateByPrimaryKeySelective(wmspInboundStackResult);
+    }
 }

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

@@ -959,29 +959,28 @@ where wisr.result_id = #{stackResultId}
             and wisr.result_number = #{resultNumber}
     </select>
     <select id="selectStackNo" resultType="java.util.Map" parameterType="java.util.Map">
-   select distinct
-  wisr.result_id "stackResultId",
-  widr.driving_id "drivingResultId",
-  rs.stacking_no "stackingNo",
-  rpg.warehouse_id "warehouseId",
-  rs.stacking_id "stackingId",
-  rs.stacking_arrival "stackingArrival"
-  from wmsp_inbound_stack_result wisr
-  left join rms_stacking rs
-    on wisr.stacking_id = rs.stacking_id
-  left join wmsp_inbound_driving_result widr
-    on widr.inbound_result_id = wisr.inbound_result_id
-  left join
-  wmsp_inbound_result wir
-  on
-  wir.inbound_id = wisr.inbound_result_id
-  left join
-  rms_pwarehouse_grid rpg
-  on
-  rpg.grid_id = wir.grid_id
-  where rpg.warehouse_id = #{warehouseId}
- and wisr.stacking_status = 0
- and rpg.warehouse_id=#{warehouseId}
+           select distinct
+          wisr.result_id "stackResultId",
+          widr.driving_id "drivingResultId",
+          rs.stacking_no "stackingNo",
+          rpg.warehouse_id "warehouseId",
+          rs.stacking_id "stackingId",
+          rs.stacking_arrival "stackingArrival"
+          from wmsp_inbound_stack_result wisr
+          left join rms_stacking rs
+            on wisr.stacking_id = rs.stacking_id
+          left join wmsp_inbound_driving_result widr
+            on widr.inbound_result_id = wisr.inbound_result_id
+          left join
+          wmsp_inbound_result wir
+          on
+          wir.inbound_id = wisr.inbound_result_id
+          left join
+          rms_pwarehouse_grid rpg
+          on
+          rpg.grid_id = wir.grid_id
+          where rpg.warehouse_id = #{warehouseId}
+         and wisr.stacking_status = 0
     </select>
 <!--  判断物资是否为线材 -->
     <select id="selectMaterialTypeByMaterialId" parameterType="java.math.BigDecimal" resultType="java.math.BigDecimal">
@@ -1032,4 +1031,5 @@ where wisr.result_id = #{stackResultId}
               and wisr.RESULT_STATUS_ = 0
     </select>
 
+
 </mapper>