2.14

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

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

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

@@ -399,7 +399,7 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
                     //将这些物资钢材id进行逻辑删除
                     i += wmspGridMaterialMapper.updateByMaterialId(materialSteelId,new Date());
                 }
-                //表示该钢材已出库
+                //表示该钢材已出库,请勿重复扫码
                 else{
                     return -1;
                 }