Merge branch 'master' of https://git.steerinfo.com/luobang/DIL-DAZHOU-WMS2

pom.xml

@@ -117,11 +117,7 @@
 <!--                        <param>WMSP_INBOUND_CORRECT_RESULT</param>-->
 <!--                        <param>WMSP_INBOUND_DRIVING_RESULT</param>-->
 <!--                        <param>WMSP_GRID_MATERIAL</param>-->
-<<<<<<< HEAD
-                        <param>WMSP_OUTBOUND_RESULT_MATERIAL</param>
-=======
-                        <param>WMSP_CHECK_WAREHOUSE</param>
->>>>>>> 1b83fb0abea144c61e3a1d3257a6b7dd1a51811d
+
                     </tables>
                 </configuration>
                 <executions>

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

@@ -461,6 +461,12 @@ public class WmspOutboundResultController extends BaseRESTfulController {
     @PostMapping("/deleteGridMaterial")
     public RESTfulResult deleteGridMaterial(@RequestParam String materialOnlyCode){
         int result = wmspOutboundResultService.deleteGridMaterial(materialOnlyCode);
+        if(result == -1){
+            return failed(-1,"请勿重复扫码");
+        }
+        if(result == -2){
+            return  failed(-2,"该钢材还未入库");
+        }
         return success(result);
     }
 }

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

@@ -20,6 +20,6 @@ public interface WmspOutboundScanResultMapper extends IBaseMapper<WmspOutboundSc
 
     List<String> getResultStrs(BigDecimal resultId);
     //通过物资唯一编码查询钢材物资唯一id
-    List<Map<String, Object>> getMaterialSteelId(String materialOnlyCode);
+    Map<String, Object> getMaterialSteelId(String materialOnlyCode);
 
 }

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

@@ -1,26 +1,20 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.feign.TmstruckFeign;
-import com.steerinfo.dil.mapper.CommonSeq;
-import com.steerinfo.dil.mapper.WmspInboundScanResultMapper;
-import com.steerinfo.dil.mapper.WmspGridMaterialMapper;
-import com.steerinfo.dil.mapper.WmspOutboundResultMapper;
-import com.steerinfo.dil.mapper.WmspOutboundScanResultMapper;
+import com.steerinfo.dil.mapper.*;
 import com.steerinfo.dil.model.WmspOutboundResult;
-import com.steerinfo.dil.model.WmspOutboundResultMaterial;
 import com.steerinfo.dil.model.WmspOutboundScanResult;
 import com.steerinfo.dil.service.IWmspOutboundResultService;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.vo.OutBoundDetailed;
 import com.steerinfo.dil.vo.OutBoundMaterialDetailedInfo;
 import com.steerinfo.dil.vo.OutBoundTypeDetailedInfo;
-import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-
 import java.util.List;
 import java.util.Map;
 
@@ -392,34 +386,23 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
         return scanResultInsert(wmspOutboundScanResult);
     }
     public int deleteGridMaterial(String materialOnlyCode) {
-        //获取扫描的物资
-       // List<Map<String,Object>> scanList = wmspOutboundScanResultMapper.getResultMaterial(resultId);
-        //根据扫描的吊牌数据查询钢材物资id
-      /*  List<Map<String,Object>> listMap = null;
         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) {
-
+           Map<String,Object> map  = wmspOutboundScanResultMapper.getMaterialSteelId(tag1[7]);
+            if(map == null){
+                return -2;
+            }
                 BigDecimal materialSteelId = DataChange.dataToBigDecimal(map.get("materialId"));
-         /*       if(materialSteelId == null){
+                Date date = (Date) map.get("updateTime");
+                //如果修改时间为空，就表示该钢材还未出库
+                if(date==null){
+                    //将这些物资钢材id进行逻辑删除
+                    i += wmspGridMaterialMapper.updateByMaterialId(materialSteelId,new Date());
+                }
+                //表示该钢材已出库,请勿重复扫码
+                else{
                     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(materialSteelId,new Date());
-            }
 
         return i;
     }

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

@@ -155,6 +155,7 @@ public class WmspSendReceiveServiceImpl implements IWmspSendReceiveService {
     }
 */
     //零点生成前一天的入库、出库、库存
+    @Override
     public int addSendReceive(){
         WmspSendReceive wmspSendReceive = new WmspSendReceive();
         int i = 0;

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

@@ -466,9 +466,10 @@
      select RESULT_MATERIAL "resultMaterial" from  WMSP_OUTBOUND_SCAN_RESULT where OUTBOUND_RESULT_ID=#{resultId}
   </select>
 
-  <select id="getMaterialSteelId" resultType="java.util.LinkedHashMap" parameterType="String">
+  <select id="getMaterialSteelId" resultType="java.util.Map" parameterType="String">
     SELECT
-       gcwz.MATERIAL_STEEL_ID "materialId"
+       wgm.MATERIAL_ID "materialId",
+       wgm.UPDATE_TIME "updateTime"
     FROM RMS_MATERIAL_STEEL gcwz
     LEFT JOIN WMSP_GRID_MATERIAL wgm
     ON gcwz.MATERIAL_STEEL_ID = wgm.MATERIAL_ID