2.10

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

@@ -497,8 +497,8 @@ public class WmspOutboundResultController extends BaseRESTfulController {
 
     //创建一个删除实时库的接口
     @PostMapping("/deleteGridMaterial")
-    public RESTfulResult deleteGridMaterial(@RequestParam Integer resultId){
-        int result = wmspOutboundResultService.deleteGridMaterial(resultId);
+    public RESTfulResult deleteGridMaterial(@RequestParam String materialOnlyCode){
+        int result = wmspOutboundResultService.deleteGridMaterial(materialOnlyCode);
         return success(result);
     }
 }

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

@@ -76,5 +76,5 @@ public interface IWmspOutboundResultService {
 //    根据orderId判断当前运输订单的状态
     int getOutboundStatus(BigDecimal orderId);
     //删除实时库存
-    int deleteGridMaterial(Integer resultId);
+    int deleteGridMaterial(String materialOnlyCode);
 }

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

@@ -229,22 +229,23 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
     }
 
     @Override
-    public int deleteGridMaterial(Integer resultId) {
+    public int deleteGridMaterial(String materialOnlyCode) {
         //获取扫描的物资
-        List<Map<String,Object>> scanList = wmspOutboundScanResultMapper.getResultMaterial(resultId);
+       // List<Map<String,Object>> scanList = wmspOutboundScanResultMapper.getResultMaterial(resultId);
         //根据扫描的吊牌数据查询钢材物资id
-        List<Map<String,Object>> listMap = null;
+      /*  List<Map<String,Object>> listMap = null;
         int i=0;
         for(Map<String,Object> scanMaterial:scanList){
-            String materialOnlyCode = scanMaterial.get("RESULT_MATERIAL").toString();
+            String materialOnlyCode = scanMaterial.get("RESULT_MATERIAL").toString();*/
+            int i=0;
             String[] tag1 = materialOnlyCode.split("\\-");
-            listMap = wmspOutboundScanResultMapper.getMaterialSteelId(tag1[7]);
+            List<Map<String,Object>> listMap  = wmspOutboundScanResultMapper.getMaterialSteelId(tag1[7]);
             for(Map<String,Object> map:listMap) {
                 BigDecimal materialId = DataChange.dataToBigDecimal(map.get("materialId"));
                 //将这些物资钢材id进行逻辑删除
                 i += wmspGridMaterialMapper.updateByMaterialId(materialId);
             }
-        }
+
         return i;
     }
 }