3.14

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

@@ -708,7 +708,7 @@ public class WmsInboundResultController extends BaseRESTfulController {
         return wmsInboundResultServiceImpl.changeReserved(mapList);
     }
 
-<<<<<<< HEAD
+
 
   //勾选撤销入库
   @PostMapping("/undoInbound")
@@ -717,13 +717,13 @@ public class WmsInboundResultController extends BaseRESTfulController {
         int result = wmsInboundResultServiceImpl.undoInbound(inboundId);
         return success(result);
   }
-=======
+
     @ApiOperation(value="获取已经下发的每个炉号的数量")
     @PostMapping("/getFurnaceNoAmount")
     public RESTfulResult getFurnaceNoAmount(@RequestBody(required = false) Map<String,Object>map) throws ParseException {
         List<Map<String,Object>> mapList = wmsInboundResultServiceImpl.getFurnaceNoAmount(map);
         return success(mapList);
     }
->>>>>>> 6aeaabd84833916e29cbd1fa3c6cd6ca0e9b8c51
+
 }
 

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

@@ -71,7 +71,7 @@ public interface WmspInboundResultMapper extends IBaseMapper<WmspInboundResult,
 
     List<Map<String, Object>> getWmsInboundResultStatistics(Map<String, Object> mapValue);
 
-<<<<<<< HEAD
+
     int  deleteInboundScanByInboudId(BigDecimal inboundId);
 
     int deleteInboundByInboudId(BigDecimal inboundId);
@@ -79,7 +79,7 @@ public interface WmspInboundResultMapper extends IBaseMapper<WmspInboundResult,
     int deleteGridMaterialByInboudId(BigDecimal inboundId);
 
     int deleteMaterialSteelByInboundId(BigDecimal inboundId);
-=======
+
     List<Map<String, Object>> getFurnaceNoAmount(String startDate, String endDate);
->>>>>>> 6aeaabd84833916e29cbd1fa3c6cd6ca0e9b8c51
+
 }

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

@@ -81,11 +81,11 @@ public interface IWmsInboundResultService {
     int changeReserved(List<Map<String, Object>> mapList);
 //    根据仓库id获取对应的统计信息
     List<Map<String, Object>> getWmsInboundResultStatistics(Map<String, Object> mapValue,Integer warehouseId);
-<<<<<<< HEAD
+
 
     int undoInbound(BigDecimal inboundId);
-=======
+
 //    获取根据仓库id获取当前下的每个炉号的数量
     List<Map<String, Object>> getFurnaceNoAmount(Map<String, Object> map) throws ParseException;
->>>>>>> 6aeaabd84833916e29cbd1fa3c6cd6ca0e9b8c51
+
 }

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

@@ -270,7 +270,7 @@ public class WmsInboundResultServiceImpl implements IWmsInboundResultService {
     }
 
     @Override
-<<<<<<< HEAD
+
     public int undoInbound(BigDecimal inboundId) {
         //根据前端传过来的inboundId
         //对实时库存表进行删除
@@ -283,7 +283,8 @@ public class WmsInboundResultServiceImpl implements IWmsInboundResultService {
         wmspInboundResultMapper.deleteInboundByInboudId(inboundId);
 
         return 0;
-=======
+    }
+
     public List<Map<String, Object>> getFurnaceNoAmount(Map<String, Object> map) throws ParseException {
         SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -331,6 +332,6 @@ public class WmsInboundResultServiceImpl implements IWmsInboundResultService {
         }
 
         return wmspInboundResultMapper.getFurnaceNoAmount(startDate,endDate);
->>>>>>> 6aeaabd84833916e29cbd1fa3c6cd6ca0e9b8c51
+
     }
 }