添加自提详情包件字段

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderPackVO.java

@@ -2,6 +2,8 @@ package com.logpm.distribution.vo;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @program: LogisticsPlatform-Service
  * @description:
@@ -25,4 +27,14 @@ public class DistributionBillOrderPackVO {
 	private String trainNumber; //客户车次号
 	private String sendWarehouseName; //客户车次号
 	private String orderCode; //始发仓
+	private String stockupStatusName; //备货状态名称
+	private String stockupConsignee; //提货人员
+	private String stockupPickUpPlate; //提货车牌
+	private String stockupConditions; //提货状态
+	private String stockupCreateUser; //提货扫描人
+	private String stockuppickUpTime; //提货时间
+	private String clerkCheck ; //文员复核人
+	private Date signForCreateTime; //签收时间
+	private Date clerkUpdateTime; //文员签收时间
+	private Date stockupCreateTime; //备货时间名称
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -57,6 +57,7 @@ import org.springblade.common.constant.loading.LoadingStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageFreezeStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageLoadingStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
+import org.springblade.common.constant.orderpackage.OrderPackageStockupStatusConstant;
 import org.springblade.common.constant.pda.PdaAudioLingoStatus;
 import org.springblade.common.constant.reservation.ReservationLoadingStatusConstant;
 import org.springblade.common.constant.reservation.ReservationOrderStatusConstant;
@@ -1543,16 +1544,21 @@ public class DistributionStockupAppController extends BladeController {
 				entity.setStockupId(stockupId);
 				entity.setParcelListId(one.getId());
 				entity.setStockQuantity(1);
+//				//修改包件备货状态
+//				DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
+//				parcelListEntity.setId(one.getId());
+//				parcelListEntity.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.yibeihu.getValue());
+//				distributionParcelListService.updateById(parcelListEntity);
 				if ("3".equals(distributionStockupEntity.getTypeService())) {
 					entity.setBillLadingId(reservationId);
 					DistributionStockupEntity byId = distributionStockupService.getById(stockupId);
 					entity.setStockupArea(byId.getStockupArea());
 
 					//修改包件备货状态
-					one.setOrderPackageStockupStatus(StockupStatusConstant.yibeihuo.getValue());
+//					one.setOrderPackageStockupStatus(StockupStatusConstant.yibeihuo.getValue());
 					//todo 待下架操作
 //						warehouseUpdownTypeClient.downPackage(stockupDTO.getPacketBarCode());
-					distributionParcelListService.updateById(one);
+//					distributionParcelListService.updateById(one);
 				} else {
 					entity.setReservationId(reservationId);
 				}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillStockController.java

@@ -82,7 +82,7 @@ public class DistrilbutionBillStockController extends BladeController {
 		return R.data(detail);
 	}
 	/**
-	 * 提货单 详情
+	 * 提货单包件 详情
 	 */
 	@GetMapping("/billOrderPack")
 	@ApiOperationSupport(order = 1)

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@@ -865,7 +865,9 @@
         from  logpm_distribution_reservation_package ldrp
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldrp.parce_list_id
         where  ldrp.reservation_id = ldsi.reservation_id
-        )  goodsAllocation,ldr.stock_status stockStatus
+        )  goodsAllocation,ldr.stock_status stockStatus,
+        ldr.reservation_num reservationNum,
+        ldr.reservation_stock_list_num reservationStockListNum
         from logpm_distribution_reservation ldr
         LEFT JOIN logpm_distribution_stockup_info ldsi on ldr.id = ldsi.reservation_id
         <where>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml

@@ -143,14 +143,45 @@
 
     </select>
     <select id="getBillOrderPack" resultType="com.logpm.distribution.vo.DistributionBillOrderPackVO">
-        select ldpl.order_package_code orderPackageCode,ldpl.warehouse ,ldpl.firsts ,ldpl.second ,ldpl.third_product thirdProduct,
-        ldpl.material_code materialCode,ldpl.material_name materialName,
-        ldpl.waybill_number waybillNumber,ldpl.send_warehouse_name sendWarehouseName,ldpl.order_code orderCode,ldpl.service_number serviceNumber,
-        lwtg.tray_code pallet,lwug.allocation_title goodsAllocation,ldpl.order_package_status orderPackageStatus
-        from logpm_distrilbution_bill_package ldbp
-        LEFT JOIN logpm_distribution_parcel_list ldpl on ldbp.parce_list_id = ldpl.id
-        LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id and lwtg.association_type = '3'
-        LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id and lwug.association_type = '3'
+        SELECT
+        ldpl.order_package_code orderPackageCode,
+        ldpl.warehouse,
+        ldpl.firsts,
+        ldpl.SECOND,
+        ldpl.third_product thirdProduct,
+        ldpl.material_code materialCode,
+        ldpl.material_name materialName,
+        ldpl.waybill_number waybillNumber,
+        ldpl.send_warehouse_name sendWarehouseName,
+        ldpl.order_code orderCode,
+        ldpl.service_number serviceNumber,
+        lwtg.tray_code pallet,
+        lwug.allocation_title goodsAllocation,
+        ldpl.order_package_status orderPackageStatus ,
+        case
+        when lds.id  is  null then '未备货'
+        else '已备货'
+        end as stockupStatusName,
+        lds.create_time  stockupCreateTime,
+        ldbl.consignee stockupConsignee,
+        ldbl.pick_up_plate stockupPickUpPlate,
+        ldbl.conditions stockupConditions,
+        ldbls.create_user stockupCreateUser,
+        ldbl.pick_up_time stockuppickUpTime,
+        ldbls.create_time signForCreateTime,
+        case
+        WHEN ldbl.conditions = 30 THEN ldbl.update_user
+        end as clerkCheck,
+        case
+        WHEN ldbl.conditions = 30 THEN ldbl.update_time
+        end as clerkUpdateTime
+        FROM logpm_distrilbution_bill_lading ldbl
+        LEFT JOIN logpm_distrilbution_bill_package ldbp on ldbl.id = ldbp.bill_lading_id
+        LEFT JOIN logpm_distribution_parcel_list ldpl ON ldbp.parce_list_id = ldpl.id
+        LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = ldpl.id
+        LEFT JOIN logpm_distribution_bill_lading_scan ldbls on ldbls.packet_bar_code = lds.coding
+        LEFT JOIN logpm_warehouse_tray_goods lwtg ON lwtg.association_id = ldpl.id  AND lwtg.association_type = '3'
+        LEFT JOIN logpm_warehouse_updown_goods lwug ON lwug.association_id = ldpl.id  AND lwug.association_type = '3'
         <where>
             ldbp.bill_lading_id = #{param.billLadingId} and ldbp.packet_bar_status in (1,2) and ldbp.bill_type = '1'
         </where>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java

@@ -1645,7 +1645,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	}
 
 	/**
-	 * 修改备货时间
+	 * 定制品 修改备货时间
 	 *
 	 * @param stockupDTO
 	 */
@@ -1656,6 +1656,16 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 		Integer scanType = stockupDTO.getScanType();//扫码类型  1 包件 2库存品
 		Long reservationId = stockupDTO.getReservationId();//预约ID
 		Long stockupId = stockupDTO.getStockupId();
+		//修改包件备货状态
+		DistributionParcelListEntity one = distributionParcelListService.getOne(Wrappers.<DistributionParcelListEntity>query().lambda()
+				.eq(DistributionParcelListEntity::getOrderPackageCode, stockupDTO.getPacketBarCode())
+		);
+		//修改包件备货状态
+		DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
+		parcelListEntity.setId(one.getId());
+		parcelListEntity.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.yibeihu.getValue());
+		distributionParcelListService.updateById(parcelListEntity);
+
 		//查询配货类型
 		DistributionStockupInfoEntity distributionStockupInfoEntity = distributionStockupInfoMapper.selectOne(Wrappers.<DistributionStockupInfoEntity>query().lambda()
 			.eq(DistributionStockupInfoEntity::getStockupId, stockupId)