Merge remote-tracking branch 'origin/dev' into pre-production

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/ExpenseDispatchTrainDetailEntity.java

@@ -73,7 +73,7 @@ public class ExpenseDispatchTrainDetailEntity extends TenantEntity {
 	 * 配送日期
 	 */
 	@ApiModelProperty(value = "配送日期")
-	@ExcelProperty("车次号")
+	@ExcelProperty("配送日期")
 	private String deliveryDate;
 	/**
 	 * 车次完成时间

blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeStartTimeVO.java

@@ -28,7 +28,7 @@ public class ReportPackgeStartTimeVO implements Serializable {
 
 	@ExcelProperty(value = "未发运件数")
 	private Integer noOutNum;
-	@ExcelProperty(value = "为发运超时件数")
+	@ExcelProperty(value = "未发运超时件数")
 	private Integer noOutOverNum;
 
 	@ExcelProperty(value = "准时发运件数")

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

@@ -636,7 +636,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			//如果发货单位没有id值，则把发货单位信息自动添加到client中
 			BasicdataClientEntity clientEntity = basicdataClientClient.findByName(shipper);
 			if(Objects.isNull(clientEntity)){
-				shipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "6");
+				shipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "7");
 			}else{
 				shipperId = clientEntity.getId();
 			}
@@ -654,7 +654,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			//如果收货单位没有id值，则把收货单位信息自动添加到client中
 			BasicdataClientEntity clientEntity = basicdataClientClient.findByName(consignee);
 			if(Objects.isNull(clientEntity)){
-				consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "2");
+				consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "7");
 			}else{
 				consigneeId = clientEntity.getId();
 			}
@@ -1010,7 +1010,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			//如果发货单位没有id值，则把发货单位信息自动添加到client中
 			BasicdataClientEntity clientEntity = basicdataClientClient.findByName(shipper);
 			if(Objects.isNull(clientEntity)){
-				shipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "6");
+				shipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "7");
 			}else{
 				shipperId = clientEntity.getId();
 			}
@@ -1028,7 +1028,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			//如果收货单位没有id值，则把收货单位信息自动添加到client中
 			BasicdataClientEntity clientEntity = basicdataClientClient.findByName(consignee);
 			if(Objects.isNull(clientEntity)){
-				consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "2");
+				consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "7");
 			}else{
 				consigneeId = clientEntity.getId();
 			}
@@ -4037,7 +4037,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		Long shipperId = openOrderDTO.getShipperId();
 		if (Objects.isNull(shipperId)) {
 			//如果发货单位没有id值，则把发货单位信息自动添加到client中
-			shipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "6");
+			shipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "7");
 		}
 		waybillEntity.setShipperId(shipperId);
 		waybillEntity.setShipper(openOrderDTO.getShipper());
@@ -4048,7 +4048,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		Long consigneeId = openOrderDTO.getConsigneeId();//收货单位id
 		if (Objects.isNull(consigneeId)) {
 			//如果收货单位没有id值，则把收货单位信息自动添加到client中
-			consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "2");
+			consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "7");
 		}
 		waybillEntity.setConsigneeId(consigneeId);
 		waybillEntity.setConsignee(openOrderDTO.getConsignee());
@@ -5491,7 +5491,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			if(Objects.isNull(newShipperId)){
 				BasicdataClientEntity clientEntity = basicdataClientClient.findByName(newShipper);
 				if(Objects.isNull(clientEntity)){
-					newShipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "6");
+					newShipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "7");
 				}else{
 					newShipperId = clientEntity.getId();
 				}
@@ -5531,7 +5531,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				waybillEntity.setServiceType(1);
 				BasicdataClientEntity clientEntity = basicdataClientClient.findByName(newConsignee);
 				if(Objects.isNull(clientEntity)){
-					newConsigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "2");
+					newConsigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "7");
 				}else{
 					newConsigneeId = clientEntity.getId();
 					waybillEntity.setServiceType(clientEntity.getTypeService());

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

@@ -11648,11 +11648,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		//判断包件是否已入库
 		DistributionParcelListEntity distributionParcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
 		if (!Objects.isNull(distributionParcelListEntity)) {
-			String orderPackageStatus = distributionParcelListEntity.getOrderPackageStatus();
-			if ("20".equals(orderPackageStatus) || "30".equals(orderPackageStatus)) {
-				log.warn("##############unloadPackage: 包件已入库 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
-				return Resp.scanFail(200,"包件已入库", "包件已入库");
-			}
+//			String orderPackageStatus = distributionParcelListEntity.getOrderPackageStatus();
+//			if ("20".equals(orderPackageStatus) || "30".equals(orderPackageStatus)) {
+//				log.warn("##############unloadPackage: 包件已入库 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
+//				return Resp.scanFail(200,"包件已入库", "包件已入库");
+//			}
+			log.warn("##############unloadPackage: 包件已入库 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
+			return Resp.scanFail(200,"包件已入库", "包件已入库");
 		}