2.11出库

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

@@ -49,7 +49,7 @@ public interface WmspGridMaterialMapper extends IBaseMapper<WmspGridMaterial, Bi
   BigDecimal slelectGridIdByMaterialOnlyCode(@Param("materialOnlyCode")String materialOnlyCode);
 
 
-  int updateByMaterialId(BigDecimal materialId);
+  int updateByMaterialId(BigDecimal materialSteelId);
 
   //查询id
     List<Map<String,Object>> getMaterialId(BigDecimal warehouseId);

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

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -45,6 +46,9 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
     @Autowired
     private WmspGridMaterialMapper wmspGridMaterialMapper;
 
+    @Autowired
+    WmspSendReceiveServiceImpl wmspSendReceiveService;
+
     @Override
     public List<Map<String, Object>> selectResultNumber(Map<String, Object> mapval) {
         return wmspOutboundResultMapper.selectResultNumber(mapval);
@@ -237,13 +241,25 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
         int i=0;
         for(Map<String,Object> scanMaterial:scanList){
             String materialOnlyCode = scanMaterial.get("RESULT_MATERIAL").toString();*/
+
             int i=0;
             String[] tag1 = materialOnlyCode.split("\\-");
             List<Map<String,Object>> listMap  = wmspOutboundScanResultMapper.getMaterialSteelId(tag1[7]);
+
             for(Map<String,Object> map:listMap) {
-                BigDecimal materialId = DataChange.dataToBigDecimal(map.get("materialId"));
+                BigDecimal materialSteelId = DataChange.dataToBigDecimal(map.get("materialId"));
+                if(materialSteelId == null){
+                    return -1;
+                }
+                //根据物资钢材id查询仓库id和物资大类id
+                BigDecimal materialId = wmspSendReceiveService.getMaterialId(materialSteelId);
+                Map<String,Object> map1 = new HashMap<>();
+                map1.put("materialId",materialId);
+                map1.put("warehouseId",3);
+                wmspSendReceiveService.addOutBoundSendReceive(map1);
+                wmspSendReceiveService.addThisdayInventorySendReceive(map1);
                 //将这些物资钢材id进行逻辑删除
-                i += wmspGridMaterialMapper.updateByMaterialId(materialId);
+                i += wmspGridMaterialMapper.updateByMaterialId(materialSteelId);
             }
 
         return i;

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

@@ -54,7 +54,7 @@ public class WmspSendReceiveServiceImpl implements IWmspSendReceiveService {
 
     @Override
     //针对每一个仓库中的每一个物资类型新增一个收发层（初始化收发层）
-    @Scheduled(cron =  "0 0 0 * * ?")
+    @Scheduled(cron =  "0 0 0 * * ? ")
     public int addSendReceive() {
         int i=0;
         WmspSendReceive wmspSendReceive = new WmspSendReceive();

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

@@ -715,7 +715,7 @@
 
   <update id="updateByMaterialId" parameterType="java.math.BigDecimal">
     update WMSP_GRID_MATERIAL WGM set WGM.DELETED = 1
-    where WGM.MATERIAL_ID = #{materialId}
+    where WGM.MATERIAL_ID = #{materialSteelId}
   </update>
   
  <select id="getMaterialId" resultType="java.util.Map" parameterType="java.math.BigDecimal">