Merge branch 'pre-production'

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -264,6 +265,7 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	 * 客户名称
 	 */
 	@ApiModelProperty(value = "客户名称")
+	@TableField(exist = false)
 	private String clineName;
 
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java

@@ -202,6 +202,10 @@ public class DistributionStockupEntity extends TenantEntity {
 	@ApiModelProperty(value = "仓库Id")
 	private Long warehouseId;
 
+	@ApiModelProperty(value = "仓库Id")
+	@TableField(exist = false)
+	private String consignee;
+
 	@ApiModelProperty(value = "仓库Id")
 	@TableField(exist = false)
 	private List<Long> warehouseIdList;

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

@@ -87,6 +87,7 @@ public class DistributionStockupAppController extends BladeController {
 	private final IDistributionStockArticleService distributionStockArticleService;
 	private final IDistributionParcelListService distributionParcelListService;
 	private final IDistributionReservationPackageService distributionReservationPackageService;
+	private final IDistributionReservationStocklistService distributionReservationStocklistService;
 	private final IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient;
 	private final IWarehouseUpdownGoodsLogClient warehouseUpdownGoodsLogClient;
 	private final IWarehouseGoodsAllocationClient warehouseGoodsAllocationClient;
@@ -465,14 +466,35 @@ public class DistributionStockupAppController extends BladeController {
 			log.warn("############备货库存品ID为空：{}",stockupDTO.getDeliveryDetailsId());
 			return R.fail(3002, "备货库存品ID不能为空");
 		}
-		List<DistributionStockupTrayVO>	list =  distributionStockupService.getLocationSelection(stockupDTO); //自提
+		//查询库存品信息
-		if(!list.isEmpty() && ObjectUtils.isNotNull(list.get(0))){
+		DistributionReservationStocklistEntity byId = distributionReservationStocklistService.getById(stockupDTO.getDeliveryDetailsId());
-			return R.data(list);
+		if(ObjectUtils.isNotNull(byId)){
-		}
+			DistributionStockListEntity byId1 = iDistributionStockListService.getById(byId.getStocklistId());
-		List<DistributionStockupTrayVO>  listMarket =  distributionStockupService.getLocationMarketSelection(stockupDTO); //商配
+			if(byId1.getSourceType().equals("2")){
-		if(!listMarket.isEmpty() && ObjectUtils.isNotNull(listMarket.get(0))){
+				//导入
-			return R.data(listMarket);
+				List<DistributionStockupTrayVO>	list =  distributionStockupService.getLocationSelection(stockupDTO); //自提
+				if(!list.isEmpty() && ObjectUtils.isNotNull(list.get(0))){
+					return R.data(list);
+				}
+				List<DistributionStockupTrayVO>  listMarket =  distributionStockupService.getLocationMarketSelection(stockupDTO); //商配
+				if(!listMarket.isEmpty() && ObjectUtils.isNotNull(listMarket.get(0))){
+					return R.data(listMarket);
+				}
+			}else{
+				//订单
+				List<DistributionStockupTrayVO>	list =  distributionStockupService.getLocationSelectionOrder(stockupDTO); //自提
+				if(!list.isEmpty() && ObjectUtils.isNotNull(list.get(0))){
+					return R.data(list);
+				}
+				List<DistributionStockupTrayVO>  listMarket =  distributionStockupService.getLocationMarketSelectionOrder(stockupDTO); //商配
+				if(!listMarket.isEmpty() && ObjectUtils.isNotNull(listMarket.get(0))){
+					return R.data(listMarket);
+				}
+
+			}
+
 		}
+
 		return Resp.scanFail("当前待备货的库存品未上架，请上架后在继续备货操作！！！","当前待备货的库存品未上架，请上架后在继续备货操作！！！");
 	}
 
@@ -733,7 +755,7 @@ public class DistributionStockupAppController extends BladeController {
 					WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = new WarehouseUpdownGoodsEntity();
 					warehouseUpdownGoodsEntity.setAllocationId(stockupDTO.getAllocationId());
 					warehouseUpdownGoodsEntity.setAssociationId(list.get(0).getId());
-					warehouseUpdownGoodsEntity.setAssociationType("4");
+					warehouseUpdownGoodsEntity.setAssociationType("3");
 					warehouseUpdownGoodsEntity.setWarehouseId(byId.getWarehouseId());
 					 locationInformation = warehouseUpdownGoodsClient.getLocationStockListInformation(warehouseUpdownGoodsEntity);
 					if(locationInformation.isEmpty()){
@@ -775,7 +797,7 @@ public class DistributionStockupAppController extends BladeController {
 //									warehouseUpdownGoodsEntity.setAssociationType("4");
 //									WarehouseUpdownGoodsEntity locationInformation = warehouseUpdownGoodsClient.getLocationStockListInformation(warehouseUpdownGoodsEntity);
 										if(!locationInformation.isEmpty()){
-											if(byId.getServiceType().equals("2")){
+											if(byId.getSourceType().equals("2")){
 												//导入下架
 												entity.setAllocationTitle(locationInformation.get(0).getPositionCode());
 												entity.setAllocationId(stockupDTO.getAllocationId());

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

@@ -60,8 +60,7 @@
     </delete>
 
 
-    <select id="selectDistributionDeliveryListPage"
+    <select id="selectDistributionDeliveryListPage"  resultType="com.logpm.distribution.entity.DistributionDeliveryListEntity">
-            resultType="com.logpm.distribution.entity.DistributionDeliveryListEntity">
         SELECT
         lddl.id id,
         lddl.train_number trainNumber,
@@ -167,7 +166,6 @@
         lddl.loading_time loadingTime,
         lddl.note_number noteNumber,
         lddl.source source,
-        lddl.vehicle_name vehicleName,
         (
         SELECT
         COALESCE (
@@ -189,8 +187,11 @@
         logpm_distribution_signfor lds
         WHERE
         lddl.id = lds.delivery_id
-        ) scannedNumber
+        ) scannedNumber,
+        GROUP_CONCAT(DISTINCT ldr.consignee SEPARATOR ',') clineName
         FROM  logpm_distribution_delivery_list lddl
+        left JOIN logpm_distribution_signfor lds on lddl.id = lds.delivery_id
+        LEFT JOIN logpm_distribution_reservation ldr on ldr.id = lds.reservation_id
         <where>
             lddl.is_deleted = 0
             <if test="param.trainNumber != null and param.trainNumber!=''">
@@ -205,6 +206,9 @@
             <if test="param.warehouseName != null and param.warehouseName!=''">
                 and lddl.warehouse_name like concat('%',#{param.warehouseName},'%')
             </if>
+            <if test="param.clineName != null and param.clineName!=''">
+                and ldr.consignee like concat('%',#{param.clineName},'%')
+            </if>
             <if test="param.vehicleName != null and param.vehicleName!=''">
                 and lddl.vehicle_name like concat('%',#{param.vehicleName},'%')
             </if>
@@ -239,6 +243,20 @@
                 and date_format(lddl.task_time,'%y%m%d%') = date_format(#{param.taskTime},'%y%m%d%')
             </if>
         </where>
+        GROUP BY lddl.id ,
+        lddl.train_number ,
+        lddl.warehouse_name ,
+        lddl.warehouse_id ,
+        lddl.type ,
+        lddl.kind ,
+        lddl.vehicle_name ,
+        lddl.driver_name ,
+        lddl.vehicle_id ,
+        lddl.driver_id ,
+        lddl.distribution_company ,
+        lddl.delivery_status ,
+        lddl.delivery_list_loading_status
+
     </select>
     <select id="selectdeliverOnevnopen" resultType="com.logpm.distribution.entity.DistributionLoadscaninvnEntity">
         SELECT

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

@@ -241,13 +241,27 @@
         ldst.tray_name trayName,
         ldst.unpack unpack,
         count(ldss.id) realNum,
-        GROUP_CONCAT( DISTINCT lwug.position_code) allocation,
+        CASE
+        WHEN ldst.source_type = '2' THEN
+        (SELECT  GROUP_CONCAT( DISTINCT lwug.position_code) allocation
+        from   logpm_warehouse_updown_goods lwug
+        where  lwug.association_id = ldst.material_id and lwug.association_type = '4'  and ldst.market_id = lwug.market_id
+        and ldst.incoming_batch = lwug.incoming_batch and ldst.warehouse_id = lwug.warehouse_id
+        )
+        WHEN ldst.source_type = '1' THEN
+        (	SELECT  GROUP_CONCAT( DISTINCT lwug.position_code) allocation
+        from logpm_distribution_parcel_list ldpl
+        LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id and lwug.association_type = '3'
+        and ldpl.warehouse_id = lwug.warehouse_id
+        where ldpl.order_code = ldst.incoming_batch
+        )
+        END allocation,
         ldrs.id deliveryDetailsId
         from logpm_distribution_reservation_stocklist ldrs
         left join logpm_distribution_stock_list ldst on ldst.id = ldrs.stocklist_id and ldst.is_deleted = 0
         left join logpm_distribution_stock ldss on ldss.stock_list_id = ldst.id and ldss.reservation_id = #{reservationId} and ldss.is_deleted = 0
-        LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldst.material_id and lwug.association_type = '4'
+       <!-- LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldst.material_id and lwug.association_type = '4'
-        and ldst.market_id = lwug.market_id and ldst.incoming_batch = lwug.incoming_batch and ldst.warehouse_id = lwug.warehouse_id
+        and ldst.market_id = lwug.market_id and ldst.incoming_batch = lwug.incoming_batch and ldst.warehouse_id = lwug.warehouse_id-->
         where ldrs.reservation_id = #{reservationId}
         and ldrs.is_deleted = 0
         group by ldst.id, ldst.storage_location, ldst.description_goods,  ldst.sku,ldrs.id,

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

@@ -181,14 +181,22 @@ public interface DistributionStockupMapper extends BaseMapper<DistributionStocku
 	List<DistributionStockupSelfVO> stockupOffShelf(@Param("param")StockupDTO stockupDTO);
 
 	/**
-	 * 自提
+	 * 自提查询导入查询
 	 * @param stockupDTO
 	 * @return
 	 */
 	List<DistributionStockupTrayVO> getLocationSelection(@Param("param") StockupDTO stockupDTO);
+	/**
+	 * 自提查询订单查询
+	 * @param stockupDTO
+	 * @return
+	 */
+	List<DistributionStockupTrayVO> getLocationSelectionOrder(@Param("param") StockupDTO stockupDTO);
 
 	List<DistributionStockupTrayVO> getLocationMarketSelection(@Param("param")StockupDTO stockupDTO);
 
+	List<DistributionStockupTrayVO> getLocationMarketSelectionOrder(@Param("param")StockupDTO stockupDTO);
+
 	/**
 	 * 零担没有货位的查询
 	 * @param stockupDTO

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

@@ -155,6 +155,18 @@
         </where>
 
     </select>
+    <select id="getLocationMarketSelectionOrder" resultType="com.logpm.distribution.vo.DistributionStockupTrayVO">
+        select DISTINCT lwug.position_code    positionCode,
+        lwug.allocation_id    allocationId,
+        lwug.allocation_title allocationTitle,
+        lwug.num
+        from logpm_distribution_reservation_stocklist ldrs
+        LEFT JOIN logpm_distribution_stock_list ldsl on ldrs.stocklist_id = ldsl.id
+        LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.order_code = ldsl.incoming_batch
+        LEFT JOIN logpm_warehouse_updown_goods lwug
+            on lwug.association_id = ldpl.id and lwug.association_type = '3' and ldsl.warehouse_id = lwug.warehouse_id
+        where ldrs.id = #{param.deliveryDetailsId}  and  lwug.allocation_id is not null
+    </select>
 
     <select id="getLocationMarketSelection" resultType="com.logpm.distribution.vo.DistributionStockupTrayVO">
         select lwug.position_code    positionCode,
@@ -167,7 +179,7 @@
                            on lwug.association_id = ldsl.material_id and lwug.association_type = '4' and
                               ldsl.market_id = lwug.market_id
                                and ldsl.incoming_batch = lwug.incoming_batch and ldsl.warehouse_id = lwug.warehouse_id
-        where ldrs.id = #{param.deliveryDetailsId}
+        where ldrs.id = #{param.deliveryDetailsId} and  lwug.allocation_id is not null
     </select>
     <select id="getLocationSelection" resultType="com.logpm.distribution.vo.DistributionStockupTrayVO">
         select lwug.position_code    positionCode,
@@ -180,9 +192,24 @@
                            on lwug.association_id = ldsl.material_id and lwug.association_type = '4' and
                               ldsl.market_id = lwug.market_id
                                and ldsl.incoming_batch = lwug.incoming_batch and ldsl.warehouse_id = lwug.warehouse_id
-        where lddd.id = #{param.deliveryDetailsId}
+        where lddd.id = #{param.deliveryDetailsId}  and  lwug.allocation_id is not null
         GROUP BY lwug.position_code, lwug.allocation_id, lwug.allocation_title, lwug.num
     </select>
+    <select id="getLocationSelectionOrder" resultType="com.logpm.distribution.vo.DistributionStockupTrayVO">
+
+        select DISTINCT lwug.position_code    positionCode,
+        lwug.allocation_id    allocationId,
+        lwug.allocation_title allocationTitle,
+        lwug.num
+        from logpm_distribution_delivery_details lddd
+        LEFT JOIN logpm_distribution_stock_list ldsl on lddd.stock_list_id = ldsl.id
+        LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.order_code = ldsl.incoming_batch
+        LEFT JOIN logpm_warehouse_updown_goods lwug
+        on lwug.association_id = ldpl.id and lwug.association_type = '3' and ldsl.warehouse_id = lwug.warehouse_id
+        where lddd.id = #{param.deliveryDetailsId}  and  lwug.allocation_id is not null
+
+    </select>
+
     <select id="stockupOffShelf" resultType="com.logpm.distribution.vo.DistributionStockupSelfVO">
         select lwug.id lwugId,lds.id ldsId,ldrp.packet_bar_code orderPackageCode,lwug.allocation_id allocationId
         from logpm_distribution_reservation ldr
@@ -207,10 +234,12 @@
         lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time
         fixTime,lds.assign_time assignTime,
         lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,
-        COALESCE(GROUP_CONCAT(DISTINCT lwug.position_code SEPARATOR ','), '')
+        COALESCE(GROUP_CONCAT(DISTINCT lwug.position_code SEPARATOR ','), '') stockipAllocation,
-        stockipAllocation,COALESCE(GROUP_CONCAT(DISTINCT lwtg.tray_code SEPARATOR ','), '') pallet
+        COALESCE(GROUP_CONCAT(DISTINCT lwtg.tray_code SEPARATOR ','), '') pallet,
+        COALESCE ( group_concat( DISTINCT ldr.consignee SEPARATOR ',' ), '' ) AS consignee
         from logpm_distribution_stockup lds
         LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id =lds.id
+        LEFT JOIN logpm_distribution_reservation ldr ON ldsi.reservation_id = ldr.id
         LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldrp.parce_list_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldrp.parce_list_id
@@ -220,6 +249,10 @@
             <if test="param.typeService != null and param.typeService != '' ">and lds.type_service =
                 #{param.typeService}
             </if>
+            <if test="param.consignee != null and param.consignee != '' ">and
+            ldr.consignee =
+                #{param.consignee}
+            </if>
             <if test="param.stockupDate != null  ">and TO_DAYS(lds.stockup_date)=TO_DAYS( #{param.stockupDate})</if>
             <if test="param.outboundDate != null  ">and TO_DAYS(lds.outbound_date)=TO_DAYS( #{param.outboundDate})</if>
             <if test="param.startDate != null  ">and lds.stockup_date between #{param.startDate} and #{param.entDate}
@@ -298,10 +331,12 @@
         lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time
         fixTime,lds.assign_time assignTime,
         lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,
-        COALESCE(GROUP_CONCAT(DISTINCT lwug.position_code SEPARATOR ','), '')
+        COALESCE(GROUP_CONCAT(DISTINCT lwug.position_code SEPARATOR ','), '')stockipAllocation,
-        stockipAllocation,COALESCE(GROUP_CONCAT(DISTINCT lwtg.tray_code SEPARATOR ','), '') pallet
+        COALESCE(GROUP_CONCAT(DISTINCT lwtg.tray_code SEPARATOR ','), '') pallet,
+        COALESCE(GROUP_CONCAT(DISTINCT ldr.consignee SEPARATOR ','), '') consignee
         from logpm_distribution_stockup lds
         LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id
+        LEFT JOIN logpm_distribution_reservation ldr on ldsi.reservation_id = ldr.id
         LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldbs.bill_lading_id = ldsi.reservation_id
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
@@ -312,6 +347,10 @@
             <if test="param.typeService != null and param.typeService != '' ">and lds.type_service =
                 #{param.typeService}
             </if>
+            <if test="param.consignee != null and param.consignee != '' ">and
+                ldr.consignee =
+                #{param.consignee}
+            </if>
             <if test="param.stockupDate != null  ">and TO_DAYS(lds.stockup_date)=TO_DAYS( #{param.stockupDate})</if>
             <if test="param.outboundDate != null  ">and TO_DAYS(lds.outbound_date)=TO_DAYS( #{param.outboundDate})</if>
             <if test="param.startDate != null  ">and lds.stockup_date between #{param.startDate} and #{param.entDate}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java

@@ -185,19 +185,33 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
 	Integer selectPackagePrint(StockupDTO stockupDTO);
 
 	/**
-	 * 库存品选择货位展示
+	 * 库存品选择货位展示 导入
 	 *
 	 * @param stockupDTO
 	 * @return
 	 */
 	List<DistributionStockupTrayVO> getLocationSelection(StockupDTO stockupDTO);
 	/**
-	 * 库存品选择货位展示
+	 * 库存品选择货位展示 订单
+	 *
+	 * @param stockupDTO
+	 * @return
+	 */
+	List<DistributionStockupTrayVO> getLocationSelectionOrder(StockupDTO stockupDTO);
+	/**
+	 * 库存品选择货位展示 导入
 	 *
 	 * @param stockupDTO
 	 * @return
 	 */
 	List<DistributionStockupTrayVO> getLocationMarketSelection(StockupDTO stockupDTO);
+	/**
+	 * 库存品选择货位展示 订单
+	 *
+	 * @param stockupDTO
+	 * @return
+	 */
+	List<DistributionStockupTrayVO> getLocationMarketSelectionOrder(StockupDTO stockupDTO);
 
 	/**
 	 * @return

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

@@ -551,7 +551,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				loadscanEntity.setOrderId(parcelListEntity.getStockArticleId());
 				loadscanEntity.setScanTime(new Date());
 				BladeUser user = AuthUtil.getUser();
-				loadscanEntity.setScanUser(user.getUserName());
+//				loadscanEntity.setScanUser(user.getUserName());
+				loadscanEntity.setScanUser(user.getNickName());
 				loadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId());
 				loadscanEntity.setIsAbnormalLoading(1);
 				//出库
@@ -690,7 +691,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 										loadscanEntity.setPackageId(parcelListEntity.getId());
 										loadscanEntity.setScanTime(new Date());
 										BladeUser user = AuthUtil.getUser();
-										loadscanEntity.setScanUser(user.getUserName());
+//										loadscanEntity.setScanUser(user.getUserName());
+										loadscanEntity.setScanUser(user.getNickName());
 										loadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId());
 										loadscanEntity.setOneClick(1);
 										loadscanEntity.setScanType("2");
@@ -1443,7 +1445,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							if (Func.isEmpty(packageLoadingScan)){
 								DistributionLoadscanEntity loadscanEntity = new DistributionLoadscanEntity();
 								BladeUser user = AuthUtil.getUser();
-								loadscanEntity.setScanUser(user.getUserName());
+//								loadscanEntity.setScanUser(user.getUserName());
+								loadscanEntity.setScanUser(user.getNickName());
 								loadscanEntity.setDriverName(finalDistributionDeliverySelfEntity.getDriverName());
 								loadscanEntity.setVehicleName(finalDistributionDeliverySelfEntity.getVehicleNub());
 								loadscanEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue());
@@ -1514,7 +1517,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								loadscanEntity = loadscanServiceOne;
 							}
 							BladeUser user = AuthUtil.getUser();
-							loadscanEntity.setScanUser(user.getUserName());
+//							loadscanEntity.setScanUser(user.getUserName());
+							loadscanEntity.setScanUser(user.getNickName());
 							loadscanEntity.setDriverName(finalDistributionDeliverySelfEntity.getDriverName());
 							loadscanEntity.setVehicleName(finalDistributionDeliverySelfEntity.getVehicleNub());
 							loadscanEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue());
@@ -1649,7 +1653,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				if (disStockListDetailEntity.getStockLockingStatus().equals(InventoryLoadingStatusConstant.weizhuangche.getValue())) {
 					DistributionLoadscaninvnEntity loadscaninvnEntity = new DistributionLoadscaninvnEntity();
 					BladeUser user = AuthUtil.getUser();
-					loadscaninvnEntity.setScanUser(user.getUserName());
+//					loadscaninvnEntity.setScanUser(user.getUserName());
+					loadscaninvnEntity.setScanUser(user.getNickName());
 					loadscaninvnEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
 					loadscaninvnEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub());
 					loadscaninvnEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue());
@@ -4946,7 +4951,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			distributionLoadscanAbnormalEntity.setDeliveryListId(deliveryListEntity.getId());
 			distributionLoadscanAbnormalEntity.setReservationId(reservationEntity.getId());
 			distributionLoadscanAbnormalEntity.setDeliveryType(deliveryListEntity.getType());
-			distributionLoadscanAbnormalEntity.setScanUser(user.getUserName());
+//			distributionLoadscanAbnormalEntity.setScanUser(user.getUserName());
+			distributionLoadscanAbnormalEntity.setScanUser(user.getNickName());
 			distributionLoadscanAbnormalEntity.setScanTime(new Date());
 			distributionLoadscanAbnormalEntity.setLoadingQuantity(parcelListEntity.getQuantity());
 			distributionLoadscanAbnormalEntity.setPackageCode(parcelListEntity.getOrderPackageCode());
@@ -5200,7 +5206,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 									loadscanEntity.setOrderId(parcelListDTO.getStockArticleId());
 									loadscanEntity.setScanTime(new Date());
 									BladeUser user = AuthUtil.getUser();
-									loadscanEntity.setScanUser(user.getUserName());
+//									loadscanEntity.setScanUser(user.getUserName());
+									loadscanEntity.setScanUser(user.getNickName());
 									loadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId());
 									loadscanEntity.setIsAbnormalLoading(1);
 									distributionLoadscanService.save(loadscanEntity);
@@ -5250,7 +5257,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								loadscanEntity.setOrderId(parcelListDTO.getStockArticleId());
 								loadscanEntity.setScanTime(new Date());
 								BladeUser user = AuthUtil.getUser();
-								loadscanEntity.setScanUser(user.getUserName());
+//								loadscanEntity.setScanUser(user.getUserName());
+								loadscanEntity.setScanUser(user.getNickName());
 								loadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId());
 								loadscanEntity.setIsAbnormalLoading(1);
 								distributionLoadscanService.save(loadscanEntity);

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

@@ -615,7 +615,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 
 		distributionStockListEntity.setMallName(Optional.ofNullable(distributionStockArticleEntity.getMallName()).orElse(null)); //商场名称
 		distributionStockListEntity.setQuantityStock(Optional.ofNullable(distributionParcelList.getQuantity()).orElse(null)); //库存数量(包件数量)
-		distributionStockListEntity.setIncomingBatch(Optional.ofNullable(distributionStockArticleEntity.getWaybillNumber()).orElse(null)); //入库批次
+		distributionStockListEntity.setIncomingBatch(Optional.ofNullable(distributionStockArticleEntity.getOrderCode()).orElse(null)); //入库批次
 		distributionStockListEntity.setOutboundQuantity(0); //出库数量
 
 //		distributionStockListEntity.setCargoUnit(Optional.ofNullable(distributionParcelList.getMaterialUnit()).orElse(null));//单位
@@ -654,6 +654,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		distributionStockListEntity.setDespatch(Optional.ofNullable(distributionStockArticleEntity.getTrainNumber()).orElse(null));//车次号
 		distributionStockListEntity.setStockArticleId(Optional.ofNullable(distributionParcelList.getStockArticleId()).orElse(null)); //订单ID
 		distributionStockListEntity.setOrderCode(Optional.ofNullable(distributionStockArticleEntity.getOrderCode()).orElse(null)); //订单自编号
+		distributionStockListEntity.setSourceType("1"); //订单自编号
 		//添加库存品记录
 		DistributionStockListInfoEntity distributionStockListInfo = new DistributionStockListInfoEntity();
 		BeanUtil.copyProperties(distributionStockListEntity,distributionStockListInfo);

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

@@ -292,6 +292,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				loadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
 				loadscanEntity.setSignforState(2);
 				loadscanEntity.setReceivedQuantity(loadscanEntity.getLoadedNub());
+				loadscanEntity.setSigningUser(AuthUtil.getUser().getNickName());
+				loadscanEntity.setSigningUserId(AuthUtil.getUser().getUserId());
 				distributionLoadscanService.updateById(loadscanEntity);
 				//缺少一个异步维护包件签收的方法
 //				distributionAsyncService.changeOrderSignforStatus(collect.get(0));
@@ -349,8 +351,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				distributionLoadscanEntity.setOrderId(collect.get(0).getStockArticleId());
 				distributionLoadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
 				distributionLoadscanEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
-				distributionLoadscanEntity.setScanUser(AuthUtil.getUser().getUserName());
+//				distributionLoadscanEntity.setScanUser(AuthUtil.getUser().getUserName());
-				distributionLoadscanEntity.setSigningUser(AuthUtil.getUser().getUserName());
+				distributionLoadscanEntity.setScanUser(AuthUtil.getUser().getNickName());
+//				distributionLoadscanEntity.setSigningUser(AuthUtil.getUser().getUserName());
+				distributionLoadscanEntity.setSigningUser(AuthUtil.getUser().getNickName());
 				distributionLoadscanEntity.setSigningUserId(AuthUtil.getUser().getUserId());
 				distributionLoadscanService.save(distributionLoadscanEntity);
 				//进行签收数量的修改
@@ -622,8 +626,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscanEntity.setOrderId(parcelListEntity.getStockArticleId());
 						distributionLoadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
 						distributionLoadscanEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
-						distributionLoadscanEntity.setScanUser(AuthUtil.getUser().getUserName());
+						distributionLoadscanEntity.setScanUser(AuthUtil.getUser().getNickName());
-						distributionLoadscanEntity.setSigningUser(AuthUtil.getUser().getUserName());
+						distributionLoadscanEntity.setSigningUser(AuthUtil.getUser().getNickName());
 						distributionLoadscanEntity.setSigningUserId(AuthUtil.getUser().getUserId());
 						distributionLoadscanEntity.setAbnormalNote("异常签收");
 						//进行签收数量的修改
@@ -1460,7 +1464,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						loadscaninvnEntity.setInventoryId(disStockListDetailEntity.getStockListId());
 						loadscaninvnEntity.setDeliveryId(distributionSignforEntity.getDeliveryId());
 						loadscaninvnEntity.setReservationId(distributionSignforEntity.getReservationId());
-						loadscaninvnEntity.setScanUser(user.getUserName());
+						loadscaninvnEntity.setScanUser(user.getNickName());
 						loadscaninvnEntity.setScanTime(new Date());
 						loadscaninvnEntity.setPackageNub(disStockListDetailEntity.getNum());
 						loadscaninvnEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue());
@@ -1472,7 +1476,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						loadscaninvnEntity.setReceivedQuantity(disStockListDetailEntity.getNum());
 						loadscaninvnEntity.setOneClick(2);
 						loadscaninvnEntity.setOneQclick(2);
-						loadscaninvnEntity.setSigningUser(user.getUserName());
+						loadscaninvnEntity.setSigningUser(user.getNickName());
 						loadscaninvnEntity.setSigningUserId(user.getUserId());
 						loadscaninvnEntity.setSigningTime(simpleDateFormat.format(new Date()));
 
@@ -2599,7 +2603,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 								loadscanEntityList.setReceivedQuantity(p.getSigningNum());
 								loadscanEntityList.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
 								loadscanEntityList.setSigningTime(simpleDateFormat.format(new Date()));
-								loadscanEntityList.setSigningUser(AuthUtil.getUser().getUserName());
+//								loadscanEntityList.setSigningUser(AuthUtil.getUser().getUserName());
+								loadscanEntityList.setSigningUser(AuthUtil.getUser().getNickName());
 								loadscanEntityList.setSigningUserId(AuthUtil.getUser().getUserId());
 								//维护装车数量
 								if (p.getSigningNum() > loadscanEntityList.getLoadedNub()) {
@@ -2700,8 +2705,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						loadscanEntity.setOrderId(p.getStockArticleId());
 						loadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
 						loadscanEntity.setDeliveryId(deliveryListEntity.getId());
-						loadscanEntity.setScanUser(AuthUtil.getUser().getUserName());
+						loadscanEntity.setScanUser(AuthUtil.getUser().getNickName());
-						loadscanEntity.setSigningUser(AuthUtil.getUser().getUserName());
+//						loadscanEntity.setScanUser(AuthUtil.getUser().getUserName());
+//						loadscanEntity.setSigningUser(AuthUtil.getUser().getUserName());
+						loadscanEntity.setSigningUser(AuthUtil.getUser().getNickName());
 						loadscanEntity.setSigningUserId(AuthUtil.getUser().getUserId());
 						distributionLoadscanService.save(loadscanEntity);
 						//进行签收数量的修改

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

@@ -281,7 +281,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		page.setSize(stockupDTO.getSize());
 		stockupDTO.setUserId(AuthUtil.getUserId());
 		stockupDTO.setStockupDateStart(stockupDTO.getStockupDateStart() + " 00:00:00");
-		stockupDTO.setStockupDateEnd(stockupDTO.getStockupDateEnd() + " 23:59:59");
+		stockupDTO.setStockupDateEnd(stockupDTO.getStockupDateEnd() + " 23:59:59")
+		;
 //		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 //		if(ObjectUtils.isNotNull(myCurrentWarehouse)){
 //			stockupDTO.setWarehouseId(myCurrentWarehouse.getId());
@@ -1153,6 +1154,30 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			});
 			return list;
 		} else {
+
+		/*	List<DistributionReservationStocklistEntity> list1 = distributionReservationStocklistService.list(Wrappers.<DistributionReservationStocklistEntity>query().lambda()
+				.eq(DistributionReservationStocklistEntity::getReservationId, stockupDTO.getReservationId())
+				.apply("stock_list_status in (1,3)")
+			);
+			//查询库存品的类型
+			List<String> listType = new ArrayList<>();
+			if(list1.isEmpty()){
+				list1.stream().forEach( i ->{
+					DistributionStockListEntity byId = distributionStockListService.getById(i.getStocklistId());
+					listType.add(byId.getSourceType());
+				});
+			}
+			if(listType.isEmpty()){
+				listType.forEach(i ->{
+					if(i.equals("2")){
+						//商，市
+						List<DistributionStockupStockListVO> list = distributionReservationService.selectStockupStockList(reservationId);
+					}else {
+
+					}
+				});
+			}*/
+
 			//商，市
 			List<DistributionStockupStockListVO> list = distributionReservationService.selectStockupStockList(reservationId);
 			list.forEach(i ->{
@@ -2027,6 +2052,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 						}
 						String packetBarCode = stockupDTO.getPacketBarCode();
 						Integer integer = baseMapper.selectPackageExist(stockupDTO);
+						//查询包件信息
 						if (ObjectUtils.isNotNull(integer) && integer > 0) {
 							//存在
 							queryWrapper.eq("coding",packetBarCode);
@@ -2251,11 +2277,21 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		return baseMapper.getLocationSelection(stockupDTO);
 	}
 
+	@Override
+	public List<DistributionStockupTrayVO> getLocationSelectionOrder(StockupDTO stockupDTO) {
+		return baseMapper.getLocationSelectionOrder(stockupDTO);
+	}
+
 	@Override
 	public List<DistributionStockupTrayVO> getLocationMarketSelection(StockupDTO stockupDTO) {
 		return baseMapper.getLocationMarketSelection(stockupDTO);
 	}
 
+	@Override
+	public List<DistributionStockupTrayVO> getLocationMarketSelectionOrder(StockupDTO stockupDTO) {
+		return baseMapper.getLocationMarketSelectionOrder(stockupDTO);
+	}
+
 	/**
 	 * @return
 	 */