Merge branch 'dev' into pre-production

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BatchUnloadDTO.java

@@ -13,6 +13,8 @@ public class BatchUnloadDTO implements Serializable {
 
 	private Long warehouseId;
 
+	private Integer incomingType;
+
 	private List<UnloadPackageDTO> unloadPackageList = new ArrayList<>();
 
 	private List<UnloadZeroDTO> unloadZeroList = new ArrayList<>();

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java

@@ -112,4 +112,5 @@ public class LoadCarsDTO implements Serializable {
 	private String remark;
 
 	private String url;
+	private Integer incomingType;
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java

@@ -532,6 +532,7 @@ public class CarsLoadApiController {
 		log.info(method + "请求参数{}", loadCarsDTO);
 		Long loadId = loadCarsDTO.getLoadId();
 		String orderPackageCode = loadCarsDTO.getOrderPackageCode();
+		Integer incomingType = loadCarsDTO.getIncomingType();
 		try{
 
 			//当前登录人选择的仓库
@@ -549,9 +550,12 @@ public class CarsLoadApiController {
 				log.warn(method+"包件码为空 orderPackageCode={}",orderPackageCode);
 				return R.fail(405,"包件码为空");
 			}
+			if(Objects.isNull(incomingType)){
+				log.warn(method+"入库类型为空 orderPackageCode={}",orderPackageCode);
+				return R.fail(405,"入库类型为空");
+			}
 
-
+			return carsLoadService.unloadPackage(loadId,orderPackageCode,myCurrentWarehouse.getId(),1,"正常卸车",incomingType);
-			return carsLoadService.unloadPackage(loadId,orderPackageCode,myCurrentWarehouse.getId(),1,"正常卸车");
 		}catch (CustomerException e){
 			log.error(e.message,e);
 			return R.fail(e.code,e.message);
@@ -654,6 +658,8 @@ public class CarsLoadApiController {
 		log.info(method + "请求参数{}", loadCarsDTO);
 		Long loadId = loadCarsDTO.getLoadId();
 		String trayCode = loadCarsDTO.getTrayCode();
+		Integer incomingType = loadCarsDTO.getIncomingType();
+
 		try{
 
 			//当前登录人选择的仓库
@@ -671,7 +677,12 @@ public class CarsLoadApiController {
 				log.warn(method+"托盘码为空 trayCode={}",trayCode);
 				return R.fail(405,"托盘码为空");
 			}
-			return carsLoadService.unloadTray(loadId,trayCode,myCurrentWarehouse.getId());
+			if(Objects.isNull(incomingType)){
+				log.warn(method+"入库类型为空 incomingType={}",incomingType);
+				return R.fail(405,"入库类型为空");
+			}
+
+			return carsLoadService.unloadTray(loadId,trayCode,myCurrentWarehouse.getId(),incomingType);
 		}catch (CustomerException e){
 			log.error(e.message,e);
 			return R.fail(e.code,e.message);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java

@@ -1550,6 +1550,7 @@ public class CarsLoadController {
 		String method = "############batchUnload: ";
 		log.info(method + "请求参数{}", batchUnloadDTO);
 		Long loadId = batchUnloadDTO.getLoadId();
+		Integer incomingType = batchUnloadDTO.getIncomingType();
 
 		try{
 
@@ -1565,6 +1566,12 @@ public class CarsLoadController {
 				log.warn(method+"配载id为空 loadId={}",loadId);
 				return R.fail(405,"配载id为空");
 			}
+			if(Objects.isNull(incomingType)){
+				log.warn(method+"入库方式为空 incomingType={}",incomingType);
+				return R.fail(405,"入库方式为空");
+			}
+
+
 
 			return carsLoadService.batchUnload(batchUnloadDTO);
 		}catch (CustomerException e){

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java

@@ -91,7 +91,7 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 
 	R arriveUnloadPageList(LoadCarsDTO loadCarsDTO);
 
-	R unloadPackage(Long loadId, String orderPackageCode, Long warehouseId,Integer unbindTray,String remark);
+	R unloadPackage(Long loadId, String orderPackageCode, Long warehouseId,Integer unbindTray,String remark,Integer incomingType);
 
 	R unloadZero(Long loadId, String waybillNo,Integer enterNum, Long warehouseId,Integer unbindTray,String trayCode,String orderCode,String remark);
 
@@ -105,7 +105,7 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 
 	R findUnloadTrayGoodsList(Long loadId, String trayCode,Long warehouseId);
 
-	R unloadTray(Long loadId, String trayCode, Long warehouseId);
+	R unloadTray(Long loadId, String trayCode, Long warehouseId,Integer incomingType);
 
 	R transferLoadPageList(LoadCarsDTO loadCarsDTO);
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java

@@ -38,7 +38,7 @@ public class InComingServiceImpl implements IInComingService {
 		Long warehouseId = inComingDTO.getWarehouseId();//仓库id
 		String warehouseName = inComingDTO.getWarehouseName();
 		Long billladingId = inComingDTO.getBillladingId();//提货单id
-		Integer incomingType = inComingDTO.getIncomingType();//入库类型
+		Integer incomingType = inComingDTO.getIncomingType();//入库类型 1码板打托 2扫码入库  3直接入库 4 按车次号入库 5按订单入库 6扫描入库 7 批量卸车入库 8卸车托盘 9卸分一体
 		String trayCode = inComingDTO.getTrayCode();//托盘码
 		String trayType = inComingDTO.getTrayType();//打托方式
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -2849,10 +2849,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		String waybillNo = loadCarsDTO.getWaybillNo();
 		Integer enterNum = loadCarsDTO.getEnterNum();
 		Long warehouseId = loadCarsDTO.getWarehouseId();
+		Integer incomingType = loadCarsDTO.getIncomingType();
 
 		String orders = null;
 		if (0 == isZero) {
-			unloadPackage(loadId, orderPackageCode, warehouseId, 1, "卸分一体 卸车");
+			unloadPackage(loadId, orderPackageCode, warehouseId, 1, "卸分一体 卸车",incomingType);
 			Map<String, Object> map = new HashMap<>();
 			map.put("trayType", trayType);
 			map.put("trayCode", trayCode);
@@ -3226,6 +3227,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	public R batchUnload(BatchUnloadDTO batchUnloadDTO) {
 		Long loadId = batchUnloadDTO.getLoadId();
 		Long warehouseId = batchUnloadDTO.getWarehouseId();
+		Integer incomingType = batchUnloadDTO.getIncomingType();
 
 		TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId);
 		if (Objects.isNull(carsLoadEntity)) {
@@ -3245,7 +3247,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		for (UnloadPackageDTO unloadPackageDTO : unloadPackageList) {
 			String orderPackageCode = unloadPackageDTO.getOrderPackageCode();
-			unloadPackage(loadId, orderPackageCode, warehouseId, 1, "批量卸车包件正常卸车");
+			unloadPackage(loadId, orderPackageCode, warehouseId, 1, "批量卸车包件正常卸车",incomingType);
 		}
 
 
@@ -4363,7 +4365,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	}
 
 	@Override
-	public R unloadPackage(Long loadId, String orderPackageCode, Long warehouseId, Integer unbindTray, String remark) {
+	public R unloadPackage(Long loadId, String orderPackageCode, Long warehouseId, Integer unbindTray, String remark,Integer incomingType) {
 		log.info("#############unloadPackage: 卸车包件");
 
 		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
@@ -4417,6 +4419,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 				InComingDTO inComingDTO = new InComingDTO();
 				inComingDTO.setOrderPackageCode(orderPackageCode);
+				inComingDTO.setIncomingType(incomingType);
 				inComingDTO.setWarehouseId(warehouseId);
 				inComingService.incomingPackage(inComingDTO);
 //				int code = r.getCode();
@@ -5063,7 +5066,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	}
 
 	@Override
-	public R unloadTray(Long loadId, String trayCode, Long warehouseId) {
+	public R unloadTray(Long loadId, String trayCode, Long warehouseId,Integer incomingType) {
 		TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId);
 		if (Objects.isNull(carsLoadEntity)) {
 			log.warn("###############unloadTray: 配载计划不存在 loadId={}", loadId);
@@ -5077,7 +5080,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			String scanCode = carsLoadScanEntity.getScanCode();
 			if (type == 1) {
 				//包件
-				unloadPackage(loadId, scanCode, warehouseId, 0, "托盘正常卸车");
+				unloadPackage(loadId, scanCode, warehouseId, 0, "托盘正常卸车",incomingType);
 			} else if (type == 2) {
 				String waybillNo = carsLoadScanEntity.getWaybillNo();
 				Integer num = carsLoadScanEntity.getNum();