1.干线bug修复

blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java

@@ -44,6 +44,7 @@ public enum WorkNodeEnums implements Serializable {
 	TRANSFER_WAREHOUSE_UNLOADING(105020, "卸车确认"),
 	SIGN_DIRECT_SHIPPER(105030,"直发商家签收"),
 	END_WAREHOUSE_UNLOADING(105040, "末端仓卸车确认"),
+	NO_STOCK_CAR(105050, "本车次少货"),
 
 	SORTING_TRAYS(201010, "分拣打托"),
 	UN_SORTING_TRAYS(201020, "包件解托"),

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

@@ -168,4 +168,8 @@ public class OpenOrderDTO implements Serializable {
 
 	private String checkRemark;
 
+	private String completeDeparture;
+
+	private String completeDestination;
+
 }

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java

@@ -560,8 +560,10 @@ public class WarehouseWaybillEntity extends TenantEntity {
 	private String settlementStatus;
 
 
+	@ApiModelProperty(value = "完整发站")
+	private String completeDeparture;
 
-
-
+	@ApiModelProperty(value = "完整到站")
+	private String completeDestination;
 
 }

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java

@@ -67,8 +67,12 @@ public class ExportWarehouseWaybillVO implements Serializable {
 
 	@ExcelProperty(value = "发站")
 	private String departure;
+	@ExcelProperty(value = "完整发站")
+	private String completeDeparture;
 	@ExcelProperty(value = "到站")
 	private String destination;
+	@ExcelProperty(value = "完整到站")
+	private String completeDestination;
 
 	@ExcelProperty(value = "货物名称")
 	private String goodsName;

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillExportVO.java

@@ -52,8 +52,12 @@ public class FinanceWaybillExportVO implements Serializable {
 
 	@ExcelProperty(value = "到站")
 	private String destination;
+	@ExcelProperty(value = "完整到站")
+	private String completeDestination;
 	@ExcelProperty(value = "发站")
 	private String departure;
+	@ExcelProperty(value = "完整发站")
+	private String completeDeparture;
 	@ExcelProperty(value = "发站仓")
 	private String departureWarehouseName;
 	@ExcelProperty(value = "目的仓")

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java

@@ -22,7 +22,9 @@ public class FinanceWaybillVO implements Serializable {
 	private String shipperMobile;
 	private String shipperAddress;
 	private String destination;
+	private String completeDestination;
 	private String departure;
+	private String completeDeparture;
 	private String departureWarehouseName;
 	private String destinationWarehouseName;
 	private String deliveryWay;

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java

@@ -193,7 +193,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 						warehousePackageTrackLogEntity.setOrderPackageCode(orderPackageCode);
 						warehousePackageTrackLogEntity.setWarehouseId(abnormalRecordDTO.getWarehouseId());
 						warehousePackageTrackLogEntity.setWarehouseName(abnormalRecordDTO.getWarehouseName());
-						warehousePackageTrackLogEntity.setWorkNode(WorkNodeEnums.UNLOAD_INCOMING_WAREHOUSE.getCode());
+						warehousePackageTrackLogEntity.setWorkNode(WorkNodeEnums.NO_STOCK_CAR.getCode());
 						warehousePackageTrackLogEntity.setContent("异常处理"+carsNo+"本车次少货");
 						warehousePackageTrackLogEntity.setOperator(AuthUtil.getNickName());
 						List<JSONObject> ls = new ArrayList<>();

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml

@@ -146,7 +146,8 @@
         lww.consignee_mobile consigneeMobile,
         lww.consignee_address consigneeAddress,
         case when lsoi.sign_status=0 then '未签收'
-        when lsoi.sign_status=1 then '已签收'
+        when lsoi.sign_status=1 then '部分签收'
+        when lsoi.sign_status=2 then '已签收'
         else '未知' end signStatus,
         lsoi.sign_date signDate,
         lww.create_time openTime,
@@ -457,6 +458,7 @@
         select
         lstp.order_info_id orderInfoId,
         GROUP_CONCAT(DISTINCT lswp.product_name ORDER BY lswp.product_name) goodsName,
+        GROUP_CONCAT(DISTINCT lstp.freight_price ORDER BY lstp.product_name) goodsPrice,
         IFNULL(sum(lstp.num),0) totalNum,
         IFNULL(sum(lstp.weight),0) totalWeight,
         IFNULL(sum(lstp.volume),0) totalVolume,

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoExportVO.java

@@ -82,6 +82,9 @@ public class StatisticsOrderInfoExportVO implements Serializable {
 	@ExcelProperty(value = "物料品类")
 	private String goodsName; // 物料品类
 
+	@ExcelProperty(value = "物料品类单价")
+	private String goodsPrice; // 物料品类
+
 	@ExcelProperty(value = "订单数量")
 	private Integer totalNum; // 订单数量
 

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsPackageFeeInfoVO.java

@@ -13,6 +13,7 @@ public class StatisticsPackageFeeInfoVO implements Serializable {
 	private Long waybillId;
 
 	private String goodsName;//物料品类
+	private String goodsPrice;//物料品类单价
 
 	private Integer totalNum;
 	private BigDecimal totalWeight;

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

@@ -976,6 +976,12 @@ public class OpenOrderController {
 			throw new CustomerException(405, "到站不能为空");
 		}
 
+		String completeDestination = openOrderDTO.getCompleteDestination();
+		if (StringUtil.isBlank(completeDestination)) {
+			log.warn("#################openOrderParamVerify: 到站不能为空 completeDestination={} ", completeDestination);
+			throw new CustomerException(405, "到站不能为空");
+		}
+
 		String orderCode = openOrderDTO.getOrderCode();
 		if (StringUtil.isBlank(orderCode)) {
 			log.warn("#################openOrderParamVerify: 订单号不能为空 orderCode={} ", orderCode);

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

@@ -602,8 +602,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		waybillEntity.setDestination(openOrderDTO.getDestination());
 		waybillEntity.setDestinationCode(openOrderDTO.getDestinationCode());
+		waybillEntity.setCompleteDestination(openOrderDTO.getCompleteDestination());
 		waybillEntity.setDeparture(openOrderDTO.getDeparture());
 		waybillEntity.setDepartureCode(openOrderDTO.getDepartureCode());
+		waybillEntity.setCompleteDeparture(openOrderDTO.getCompleteDeparture());
 		waybillEntity.setGoodsName(openOrderDTO.getGoodsName());
 		waybillEntity.setTotalCount(openOrderDTO.getTotalCount());
 		waybillEntity.setTotalVolume(openOrderDTO.getTotalVolume());
@@ -903,6 +905,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		waybillEntity.setBrand(openOrderDTO.getBrand());
 		waybillEntity.setDeparture(openOrderDTO.getDeparture());
 		waybillEntity.setDepartureCode(openOrderDTO.getDepartureCode());
+		waybillEntity.setCompleteDeparture(openOrderDTO.getCompleteDeparture());
 		waybillEntity.setDealerCode(openOrderDTO.getDealerCode());
 		waybillEntity.setDealerName(openOrderDTO.getDealerName());
 		waybillEntity.setPickupCompleteOrNot(openOrderDTO.getPickupCompleteOrNot());
@@ -952,6 +955,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		waybillEntity.setDestination(openOrderDTO.getDestination());
 		waybillEntity.setDestinationCode(openOrderDTO.getDestinationCode());
+		waybillEntity.setCompleteDestination(openOrderDTO.getCompleteDestination());
 		waybillEntity.setGoodsName(openOrderDTO.getGoodsName());
 		waybillEntity.setGoodsCode(openOrderDTO.getGoodsCode());
 		waybillEntity.setTotalCount(openOrderDTO.getTotalCount());
@@ -5226,6 +5230,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			stringBuilder.append("发站：").append(departure).append("-->").append(newDeparture).append(";");
 			waybillEntity.setDeparture(newDeparture);
 			waybillEntity.setDepartureCode(openOrderDTO.getDepartureCode());
+			waybillEntity.setCompleteDeparture(openOrderDTO.getCompleteDeparture());
 		}
 
 		Integer newPickupCompleteOrNot = openOrderDTO.getPickupCompleteOrNot();
@@ -5263,6 +5268,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			stringBuilder.append("到站：").append(destination).append("-->").append(newDestination).append(";");
 			waybillEntity.setDestination(newDestination);
 			waybillEntity.setDestinationCode(openOrderDTO.getDestinationCode());
+			waybillEntity.setCompleteDestination(openOrderDTO.getCompleteDestination());
 		}
 		Long newDestinationWarehouseId = openOrderDTO.getDestinationWarehouseId();
 		String newDestinationWarehouseName = openOrderDTO.getDestinationWarehouseName();

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

@@ -981,19 +981,19 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 						}
 						parcelList.setConditions(1);
 						parcelList.setOrderPackageCode(orderPackageCode);
-						parcelList.setFirsts(advanceDetailEntity.getFirstPackName());
-						parcelList.setSecond(advanceDetailEntity.getSecondPackName());
-						parcelList.setThirdProduct(advanceDetailEntity.getThirdPackName());
+						parcelList.setFirsts(ad.getFirstPackName());
+						parcelList.setSecond(ad.getSecondPackName());
+						parcelList.setThirdProduct(ad.getThirdPackName());
 						parcelList.setQuantity(1);
 						parcelList.setStockArticleId(orderId);
 						parcelList.setOrderCode(orderCode);
-						parcelList.setServiceNumber(advanceDetailEntity.getServiceNum());
+						parcelList.setServiceNumber(ad.getServiceNum());
 						parcelList.setTrainNumber(trainNumber);
 						parcelList.setAdvanceId(ad.getAdvanceId());
 
-						Long materialId = advanceDetailEntity.getMaterialId();
-						String materialCode = advanceDetailEntity.getMaterialCode();
-						String materialName = advanceDetailEntity.getMaterialName();
+						Long materialId = ad.getMaterialId();
+						String materialCode = ad.getMaterialCode();
+						String materialName = ad.getMaterialName();
 
 						parcelList.setMaterialId(materialId);
 						parcelList.setMaterialName(materialName);
@@ -1021,7 +1021,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 							}
 						}
 
-						String brand = advanceDetailEntity.getBrand();
+						String brand = ad.getBrand();
 						BasicdataBrandEntity basicdataBrand = basicdataBrandClient.findEntityByName(brand);
 						if(!Objects.isNull(basicdataBrand)){
 							parcelList.setBrandId(basicdataBrand.getId());

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml

@@ -159,7 +159,9 @@
         lww.shipper_mobile shipperMobile,
         lww.shipper_address shipperAddress,
         lww.destination destination,
+        lww.complete_destination completeDestination,
         lww.departure departure,
+        lww.complete_departure completeDeparture,
         lww.departure_warehouse_name departureWarehouseName,
         lww.destination_warehouse_name destinationWarehouseName,
         lww.delivery_way deliveryWay,
@@ -283,9 +285,15 @@
         <if test="param.destination != null and param.destination != ''">
             and Locate(#{param.destination},lww.destination) > 0
         </if>
+        <if test="param.completeDestination != null and param.completeDestination != ''">
+            and Locate(#{param.completeDestination},lww.complete_destination) > 0
+        </if>
         <if test="param.departure != null and param.departure != ''">
             and Locate(#{param.departure},lww.departure) > 0
         </if>
+        <if test="param.completeDeparture != null and param.completeDeparture != ''">
+            and Locate(#{param.completeDeparture},lww.complete_departure) > 0
+        </if>
         <if test="param.payType != null">
             and lww.pay_type = #{param.payType}
         </if>
@@ -435,7 +443,9 @@
         lww.shipper_mobile shipperMobile,
         lww.shipper_address shipperAddress,
         lww.destination destination,
+        lww.complete_destination completeDestination,
         lww.departure departure,
+        lww.complete_departure completeDeparture,
         lww.departure_warehouse_name departureWarehouseName,
         lww.destination_warehouse_name destinationWarehouseName,
         lww.delivery_way deliveryWay,
@@ -553,9 +563,15 @@
         <if test="param.destination != null and param.destination != ''">
             and Locate(#{param.destination},lww.destination) > 0
         </if>
+        <if test="param.completeDestination != null and param.completeDestination != ''">
+            and Locate(#{param.completeDestination},lww.complete_destination) > 0
+        </if>
         <if test="param.departure != null and param.departure != ''">
             and Locate(#{param.departure},lww.departure) > 0
         </if>
+        <if test="param.completeDeparture != null and param.completeDeparture != ''">
+            and Locate(#{param.completeDeparture},lww.complete_departure) > 0
+        </if>
         <if test="param.payType != null">
             and lww.pay_type = #{param.payType}
         </if>
@@ -669,7 +685,9 @@
         lww.shipper_mobile shipperMobile,
         lww.shipper_address shipperAddress,
         lww.destination destination,
+        lww.complete_destination completeDestination,
         lww.departure departure,
+        lww.complete_departure completeDeparture,
         lww.departure_warehouse_name departureWarehouseName,
         lww.destination_warehouse_name destinationWarehouseName,
         case when lww.delivery_way='1' then '自提'
@@ -826,9 +844,15 @@
         <if test="param.destination != null and param.destination != ''">
             and Locate(#{param.destination},lww.destination) > 0
         </if>
+        <if test="param.completeDestination != null and param.completeDestination != ''">
+            and Locate(#{param.completeDestination},lww.complete_destination) > 0
+        </if>
         <if test="param.departure != null and param.departure != ''">
             and Locate(#{param.departure},lww.departure) > 0
         </if>
+        <if test="param.completeDeparture != null and param.completeDeparture != ''">
+            and Locate(#{param.completeDeparture},lww.complete_departure) > 0
+        </if>
         <if test="param.payType != null">
             and lww.pay_type = #{param.payType}
         </if>
@@ -953,7 +977,9 @@
         lww.consignee_mobile consigneeMobile,
         lww.consignee_address consigneeAddress,
         lww.destination destination,
+        lww.complete_destination completeDestination,
         lww.departure departure,
+        lww.complete_departure completeDeparture,
         lww.cost_piece costPiece,
         lww.cost_zhang costZhang,
         lww.cost_num costNum,
@@ -1070,9 +1096,15 @@
         <if test="param.destination != null and param.destination != ''">
             and Locate(#{param.destination},lww.destination) > 0
         </if>
+        <if test="param.completeDestination != null and param.completeDestination != ''">
+            and Locate(#{param.completeDestination},lww.complete_destination) > 0
+        </if>
         <if test="param.departure != null and param.departure != ''">
             and Locate(#{param.departure},lww.departure) > 0
         </if>
+        <if test="param.completeDeparture != null and param.completeDeparture != ''">
+            and Locate(#{param.completeDeparture},lww.complete_departure) > 0
+        </if>
         <if test="param.payType != null">
             and lww.pay_type = #{param.payType}
         </if>