修改自提备货

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

@@ -48,7 +48,12 @@ public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity {
 	private String warehouse;
 	private String warehouseEntryTime;
 	private String storageFee;
+	//计划件数
 	private String totalNumber;
+	//实际件数
+	private String handQuantity;
+	//货物名称
+	private String productInformation;
 	//订单自编号
 	private String orderCode;
 	private String brand;
@@ -64,7 +69,7 @@ public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity {
 
 	private Integer treatNum; //待
 	private Integer signedFor ; //已签收
-	private Integer stopNum; //已
+	private Integer stopNum; //实提件数
 	private Integer sumTotal; //总数
 
 	@ApiModelProperty(value = "提货状态")

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

@@ -266,6 +266,7 @@ public class DistributionStockupAppController extends BladeController {
 				DistributionStockupSelfVO distributionStockupSelfVO = distributionStockupService.selectStockupStockListDetails(reservationId);
 				map = convertObjectToMap(distributionStockupSelfVO);
 				//库存品
+
 				List<DistributionStockupStockListVO> list = distributionStockupService.selectStockupStockList(stockupDTO);
 				map.put("stockList", list);
 			}
@@ -342,7 +343,9 @@ public class DistributionStockupAppController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "配置包条码", notes = "传入stockupDTO")
 	public R stockConfigList(@RequestBody StockupDTO stockupDTO) {
-
+	if(ObjectUtils.isNull( stockupDTO.getTypeService()) ){
+		throw new ServiceException("服务类型不能为空！！！");
+		}
 
 		StockConfigInfoVO stockConfigOrderPackageListVOS = distributionStockupService.stockConfigList(stockupDTO);
 
@@ -436,10 +439,12 @@ public class DistributionStockupAppController extends BladeController {
 	@ApiOperation(value = "备货库存品生成包件码", notes = "传入stockupDTO")
 	public R stockupStockListPackageCode(@RequestBody StockupDTO stockupDTO) {
 		Long reservationId = stockupDTO.getReservationId();//预约单id
-
+		if(ObjectUtils.isNull(stockupDTO.getTypeService())){
+			throw new ServiceException("服务类型不能为空！！");
+		}
 
 		// 根据当前库位获取最早入库的入库批次
-		Long stockListId = distributionStockupService.selectStockListInfoByCargoNumber(stockupDTO.getReservationId(), stockupDTO.getCargoNumber(), stockupDTO.getAllocationId());
+		Long stockListId = distributionStockupService.selectStockListInfoByCargoNumber(stockupDTO.getReservationId(), stockupDTO.getCargoNumber(), stockupDTO.getAllocationId(),stockupDTO.getTypeService());
 		log.warn("##############stockupStockListPackageCode: 库存品id为空 stockListId={}", stockListId);
 		if (Objects.isNull(stockListId)) {
 			return R.fail("当前库位没有无数据的库存品");
@@ -1538,7 +1543,7 @@ public class DistributionStockupAppController extends BladeController {
 				entity.setStockupId(stockupId);
 				entity.setParcelListId(one.getId());
 				entity.setStockQuantity(1);
-				if (distributionStockupEntity.getTypeService().equals("3")) {
+				if ("3".equals(distributionStockupEntity.getTypeService())) {
 					entity.setBillLadingId(reservationId);
 					DistributionStockupEntity byId = distributionStockupService.getById(stockupId);
 					entity.setStockupArea(byId.getStockupArea());

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

@@ -110,9 +110,9 @@ public class DistributionStockController extends BladeController  {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "系统备货新增", notes = "传入distributionStock")
 	public R addStockDetail(@Valid @RequestBody DistributionStockDTO distributionStock) {
-		if(ObjectUtils.isNull(distributionStock.getGoodsAreaId())){
+	/*	if(ObjectUtils.isNull(distributionStock.getGoodsAreaId())){
 			return R.fail("注意，注意：备货区未选择！");
-		}
+		}*/
 
 
 		return R.status(distributionStockService.addStockDetail(distributionStock));

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

@@ -336,6 +336,9 @@
             <if test="param.stockArticleId != null and param.stockArticleId != ''">and ldpl.stock_article_id =
                 #{param.stockArticleId}
             </if>
+            <if test="param.reservationId != null and param.reservationId != ''"> and ldbp.bill_lading_id =
+                #{param.reservationId}
+            </if>
             <if test="param.stockArticleIdList != null ">
                 and ldpl.stock_article_id in
                 <foreach collection="param.stockArticleIdList" separator="," open="(" close=")" item="a">

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

@@ -395,6 +395,7 @@
             <!--<if test="param.groupName != null and param.groupName != '' "> and btg.group_name like concat('%', #{param.groupName},'%')</if> -->
         </where>
         GROUP BY lds.id
+        ORDER By lds.create_time Desc
     </select>
 
     <select id="selectHomeStockupPage" resultType="com.logpm.distribution.vo.DistributionStockupListVO">
@@ -495,9 +496,8 @@
         from logpm_distrilbution_bill_stock
         where bill_lading_id = ldsi.reservation_id and order_status in (1,2) ) orderNum,
         (
-        select COUNT(DISTINCT ldpl.id)
+        select COUNT(DISTINCT ldbs.id)
-        from logpm_distrilbution_bill_stock ldbs
+        from logpm_distrilbution_bill_package ldbs
-        LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id
         where ldbs.bill_lading_id = ldsi.reservation_id
         ) planNum,
         (
@@ -575,19 +575,20 @@
     <select id="selectStockupSelf" resultType="com.logpm.distribution.vo.DistributionStockupStockListVO">
         select lddd.stock_list_id                        stockListId,
                GROUP_CONCAT(DISTINCT lwug.position_code) allocation,
+               GROUP_CONCAT(DISTINCT lwug.allocation_id) allocations,
                ldsl.description_goods                    materialName,
                ldsl.sku                                  sku,
                ldsl.cargo_norms                          cargoNorms,
+               ldsl.cargo_number                         cargoNumber,
                lddd.quantity                             planNum,
                ldsl.cargo_unit                           cargoUnit,
                ldsl.tray_name                            trayName,
                 ldsl.unpack                               unpack,
                ldsl.source_type                               sourceType,
-
                (
                    select COUNT(id)
-                   from logpm_distribution_stock
+                   from logpm_dis_stock_list_detail
-                   where bill_lading_id = lddd.bill_lading_id
+                   where reservation_id = lddd.bill_lading_id  and stock_package_code is NOT null
                )                                         realNum,
                lddd.id                                   deliveryDetailsId
         from logpm_distribution_delivery_details lddd
@@ -698,7 +699,13 @@
         select COUNT(id)
         from logpm_distribution_stock
         where bill_lading_id = ldbs.bill_lading_id
-        ) stockupNum,lds.stockup_status stockupStatus ,lds.type_service typeService
+        ) stockupNum,lds.stockup_status stockupStatus ,lds.type_service typeService,
+        (
+        SELECT sum(lddd.quantity)
+        from logpm_distribution_delivery_details lddd
+        where lddd.bill_lading_id = ldsi.reservation_id
+        ) inventoryNub,
+        GROUP_CONCAT(DISTINCT ldsa.mall_name) mallName
         from logpm_distribution_stockup lds
         LEFT JOIN logpm_distribution_stockup_info ldsi on lds.id = ldsi.stockup_id
         LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldsi.reservation_id = ldbs.bill_lading_id

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

@@ -34,7 +34,7 @@
         GROUP_CONCAT(DISTINCT dsa.brand) brand,dsa.type_service typeService,dbl.pick_up_time pickUpTime,dbl.consignee,dbl.delivery_document
         deliveryDocument,dbl.conditions,dbl.total_cost totalCost,
         dbl.pick_up_plate pickUpPlate,dbl.pickup_batch pickupBatch,
-        (
+      <!--  (
         select COUNT(lds.id)
         from logpm_distribution_delivery_details lddd
         LEFT JOIN logpm_distribution_stock lds on lds.stock_list_id = lddd.stock_list_id
@@ -44,6 +44,11 @@
         from logpm_distrilbution_bill_stock ldbs
         LEFT JOIN logpm_distribution_stock lds on lds.stock_article = ldbs.stock_article_id
         where ldbs.bill_lading_id = dbl.id
+        ) stopNum, -->
+        (
+        select COUNT(id)
+        from  logpm_distribution_bill_lading_scan
+        where bill_lading_id = dbl.id
         ) stopNum,
         GROUP_CONCAT(DISTINCT dsa.order_code) orderCode
         from logpm_distrilbution_bill_lading dbl
@@ -111,7 +116,8 @@
             </if>
 
         </where>
-        GROUP BY dbl.id,dsa.warehouse,dsa.warehouse_entry_time,dsa.storage_fee,dsa.type_service
+        GROUP BY dbl.id,dsa.warehouse,dsa.type_service
+        Order BY  dbl.create_time desc
     </select>
 
     <select id="exportDistributionBillLading" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingVO">
@@ -413,7 +419,7 @@
     </select>
 
     <select id="selectBillStockList" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingVO">
-        SELECT dbl.id,
+         SELECT  DISTINCT       dbl.id,
                dsa.service_number       serviceNumber,
                dsa.waybill_number       waybillNumber,
                dsa.consignee_unit       consigneeUnit,
@@ -422,7 +428,9 @@
                dsa.warehouse,
                dsa.warehouse_entry_time warehouseEntryTime,
                dsa.storage_fee          storageFee,
-               dsa.total_number         totalNumber,
+               COUNT(ldbp.id)         totalNumber,
+               COUNT(lds.id)         handQuantity,
+               GROUP_CONCAT(DISTINCT lds.goods_name)  productInformation,
                dbl.certificate_type     certificateType,
                dsa.brand,
                dsa.type_service         typeService,
@@ -434,10 +442,11 @@
                dbl.total_cost           totalCost,
                dbl.pick_up_plate        pickUpPlate,
                dbl.pickup_batch         pickupBatch
-        FROM logpm_distrilbution_bill_lading dbl
+                FROM logpm_distrilbution_bill_lading dbl
+                 LEFT JOIN logpm_distrilbution_bill_package ldbp on ldbp.bill_lading_id = dbl.id
+                 LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = ldbp.parce_list_id
                  LEFT JOIN logpm_distribution_stock_article dsa ON dbl.stock_article_id = dsa.id
-                 LEFT JOIN logpm_distribution_stockup_info ldsi on dbl.id = ldsi.reservation_id and
+                 LEFT JOIN logpm_distribution_stockup_info ldsi on dbl.id = ldsi.reservation_id and  ldsi.stock_up_type = #{distrilbutionBillLading.stockupType}
-                                                                   ldsi.stock_up_type = #{distrilbutionBillLading.stockupType}
         where ldsi.stockup_id = #{distrilbutionBillLading.id};
     </select>
 

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

@@ -118,7 +118,7 @@
         select DISTINCT ldsa.order_code orderCode,ldsa.description_goods descriptionGoods,ldsa.stockup_status stockupStatus,
         (select COUNT(id) from  logpm_distrilbution_bill_package
         where  stock_article_id = ldsa.id and packet_bar_status in (1,3)) handQuantity,
-        (select GROUP_CONCAT(IFNULL(ldpl.material_name , '') SEPARATOR ', ')
+        (select GROUP_CONCAT(DISTINCT ldpl.material_name )
         from logpm_distribution_parcel_list ldpl
         where  ldpl.material_name is not null and ldpl.stock_article_id = ldbs.stock_article_id)   materialName,
         (select count(lds.id)

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

@@ -260,12 +260,14 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
 
 	/**
 	 * 查询库位上最新入库的库存品
+	 *
 	 * @param reservationId
 	 * @param cargoNumber
 	 * @param allocationId
+	 * @param typeService
 	 * @return
 	 */
-	Long selectStockListInfoByCargoNumber(Long reservationId, String cargoNumber, Long allocationId);
+	Long selectStockListInfoByCargoNumber(Long reservationId, String cargoNumber, Long allocationId,String typeService);
 
 
 	StockConfigInfoVO stockConfigList(StockupDTO stockupDTO);

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

@@ -2445,10 +2445,10 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	public void stockupSelfUpdateState(StockupDTO stockupDTO, int num) {
 
 		//查询全部订单数据
-		List<DistrilbutionBillStockEntity> distrilbutionBillStockEntities = distrilbutionBillStockMapper.selectList(Wrappers.<DistrilbutionBillStockEntity>query().lambda()
+//		List<DistrilbutionBillStockEntity> distrilbutionBillStockEntities = distrilbutionBillStockMapper.selectList(Wrappers.<DistrilbutionBillStockEntity>query().lambda()
-			.eq(DistrilbutionBillStockEntity::getBillLadingId, stockupDTO.getReservationId())
+//			.eq(DistrilbutionBillStockEntity::getBillLadingId, stockupDTO.getReservationId())
-			.apply("order_status in (1,2)")
+//			.apply("order_status in (1,2)")
-		);
+//		);
 		//查询是否有零担信息
 		List<DistributionReservationZeroPackageEntity> listZero = reservationZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
 			.eq(DistributionReservationZeroPackageEntity::getReservationId, stockupDTO.getReservationId())

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

@@ -330,9 +330,15 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 				 int ys = 0; //已扫
 				 int qb = 0; //全部
 				if(ObjectUtils.isNotNull(distributionSelf)){
+					Integer wholeNum = 0 ;
+					if(ObjectUtils.isNull(distributionSelf.getWholeNum())){
+						qb += 0;
+					}else{
+						qb += distributionSelf.getWholeNum();
+					}
 					//有库存品
 					ys += distributionSelf.getEsauNum();
-					qb += distributionSelf.getWholeNum();
+
 				}
 				if(ObjectUtils.isNotNull(distributionStockSelf)){
 					//有订单

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

@@ -64,6 +64,8 @@ import org.springblade.common.constant.stocklist.StockSignfoStatusConstant;
 import org.springblade.common.constant.stocklist.StockStatusConstant;
 import org.springblade.common.constant.stockup.StockAssignStatusConstant;
 import org.springblade.common.constant.stockup.StockupStatusConstant;
+import org.springblade.common.constant.stockup.StockupTypeConstant;
+import org.springblade.common.constant.stockup.StockupTypeStatusConstant;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -316,7 +318,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 //			throw new ServiceException("没有选择仓库！！！");
 //		}
 		IPage<DistributionStockupListVO> distributionStockupEntityIPage = baseMapper.selectHomeStockupPage(page, stockupDTO);
-//		IPage<DistributionStockupListVO> distributionStockupEntityIPage = baseMapper.selectStockupPage(page, stockupDTO);
+
 		List<DistributionStockupListVO> records = distributionStockupEntityIPage.getRecords();
 		for (DistributionStockupListVO vo : records) {
 			AtomicReference<Boolean> b = new AtomicReference<>(false);
@@ -333,9 +335,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					int sum = list.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum();
 					nu.set((int) (nu.get() + sum));
 					b.set(true);
-					//自提
-//					List<DistributionStockPackageVO> list2self = distrilbutionBillStockService.listPackageSelf(z.getReservationId());
-//					nu.set(nu.get()+list2self.size());
 				}
 
 				if (z.getStockUpType().equals("3")) {
@@ -367,63 +366,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			if (ObjectUtils.isNull(vo.getInventoryNub())) {
 				vo.setInventoryNub(0);
 			}
-			//查询库位信息
-//			//1.通过预约单号查询所有包件的库位信息
-//			Long reservationId = vo.getReservationId();
-//			List<String> packageAllocation = distributionParcelListService.selectWarehouseAreaByReservationId(reservationId);
-//			//2.通过预约单查询所有库存品的库位信息
-//			List<String> stockListAllocation = distributionStockListService.selectWarehouseAreaByReservationId(reservationId);
-//			String allocation = dealwithAllocation(packageAllocation, stockListAllocation);
-//			//查询托盘信息
-//			//1.查询包件托盘信息`
-//			List<String> packagePallet = distributionParcelListService.selectPalletByReservationId(reservationId);
-//			//2.查询库存品托盘信息
-//			List<String> stockListPallet = distributionStockListService.selectPalletByReservationId(reservationId);
-//			String pallet = deakwithPallet(packagePallet, stockListPallet);
-
-//			//查询对应预约单的订单总数
-//			Integer orderNum = distributionReservationService.selectOrderNumByReservationId(reservationId);
-//
-//			//查询计划件数
-//			Integer planNum = distributionReservationService.selectPlanNum(reservationId);
-
-			//查询已备货件数
-//			Integer realNum = distributionStockupScanService.selectRealNum(reservationId);
-//			Integer realNum = distributionStockService.selectRealNum(reservationId);
-
-			//备货任务是否完成通过扫描表中的记录数量和计划数量对比
-//			if (realNum.equals(planNum)) {
-//				vo.setStockupStatusStr("是");
-//			} else {
-//				vo.setStockupStatusStr("否");
-//			}
-//			vo.setWarehouseArea(allocation);
-//			vo.setTrays(pallet);
-//			vo.setOrderNum(orderNum);
-//			vo.setPlanNum(planNum);
-//			vo.setRealNum(realNum);
 		}
 		distributionStockupEntityIPage.setRecords(records);
 		return distributionStockupEntityIPage;
 
-//			//查询该备货单上对应的客户
-//			//1.通过备货任务id查询得到所有的预约单
-//			List<Long> reservationIds = distributionStockupInfoService.selectReservationIdListByStockupId(stockupId);
-//			//2.通过预约id查到所有的预约单
-//			List<DistributionReservationEntity> reservationEntities = distributionReservationService.selectListByIds(reservationIds);
-//			//3.拼接客户名称
-//			vo.setCustomer(getCustomer(reservationEntities));
-//			//4.拿到所有包件的托盘信息
-//			vo.setTrays(getTrays(reservationEntities));
-//			//5.查询订单总数 计划数量 备货件数
-//			Map<String, Integer> nums = getNums(reservationEntities);
-//			vo.setOrderNum(nums.get("orderNum"));
-//			vo.setPlanNum(nums.get("stockNum"));
-//			//6.查询已扫描备货的数据 TODO 还需要查询逻辑
-//			vo.setRealNum(0);
-//		}
-
-
 	}
 
 	@Override
@@ -471,7 +417,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					} else {
 						i.setStockupNum(0);
 					}
-
 				});
 				map.put("orderList", list);
 			} else {
@@ -1201,6 +1146,21 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				if (i.getPlanNum().equals(i.getRealNum())) {
 					i.setCompleteStact(true);
 				}
+				if (Func.isNotEmpty(i.getAllocations())){
+
+					String[] ids = i.getAllocations().split(",");
+					List<WarehouseGoodsAllocationEntity> allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(ids);
+
+					for (WarehouseGoodsAllocationEntity allocationInforById : allocationInforByIds) {
+						if (i.getAllocationList() == null) {
+							i.setAllocationList(new ArrayList<>());
+						}
+						Map<String, Object> map = new HashMap<>();
+						map.put("id", allocationInforById.getId());
+						map.put("name", allocationInforById.getQrCode());
+						i.getAllocationList().add(map);
+					}
+				}
 			});
 			return list;
 		} else {
@@ -2881,10 +2841,31 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	}
 
 	@Override
-	public Long selectStockListInfoByCargoNumber(Long reservationId, String cargoNumber, Long allocationId) {
+	public Long selectStockListInfoByCargoNumber(Long reservationId, String cargoNumber, Long allocationId, String typeService) {
+		Long mallId = null;
+		String mallName = null;
+		if(typeService.equals(StockupTypeConstant.ziti.getValue())){
+			//自提
+			//  查询预约单的上的信息
+			List<DistrilbutionBillStockEntity> list = distrilbutionBillStockService.list(Wrappers.<DistrilbutionBillStockEntity>query().lambda().
+				eq(DistrilbutionBillStockEntity::getBillLadingId, reservationId)
+				.apply("order_status in (1,2)")
+			);//预约信息
+			if(!list.isEmpty()){
+				DistributionStockArticleEntity byId = distributionStockArticleService.getById(list.get(0).getStockArticleId());
+				mallId = byId.getMallId();
+				mallName = byId.getMallName();
+
+			}
+
+		}else{
+			// 查询预约单上的商城
+			DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(reservationId);
+			mallId = distributionReservationEntity.getMallId();
+			mallName = distributionReservationEntity.getMallName();
+
+		}
 
-		// 查询预约单上的商城
-		DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(reservationId);
 		//查询货位上物料信息
 		// todo
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
@@ -2905,7 +2886,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = JSONObject.parseObject(jsonObject.toJSONString(), WarehouseUpdownGoodsEntity.class);
 					if (warehouseUpdownGoodsEntity.getAssociationType().equals("4")) {
 						// 无数据库存品
-						if (cargoNumber.equals(warehouseUpdownGoodsEntity.getAssociationValue()) && warehouseUpdownGoodsEntity.getMarketId().equals(distributionReservationEntity.getMallId())) {
+						if (cargoNumber.equals(warehouseUpdownGoodsEntity.getAssociationValue()) && warehouseUpdownGoodsEntity.getMarketId().equals(mallId)) {
 							incomingBatches.add(warehouseUpdownGoodsEntity.getIncomingBatch());
 						}
 					}
@@ -2920,7 +2901,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			LambdaQueryWrapper<DistributionStockListEntity> lambdaQueryWrapper = new LambdaQueryWrapper();
 			lambdaQueryWrapper.in(DistributionStockListEntity::getIncomingBatch, incomingBatches);
 			lambdaQueryWrapper.eq(DistributionStockListEntity::getCargoNumber, cargoNumber);
-			lambdaQueryWrapper.eq(DistributionStockListEntity::getMarketName, distributionReservationEntity.getMallName());
+			lambdaQueryWrapper.eq(DistributionStockListEntity::getMarketName, mallName);
 			// 入库 时间先进的先出
 			lambdaQueryWrapper.orderByAsc(DistributionStockListEntity::getCreateTime);
 			List<DistributionStockListEntity> distributionStockListEntities = distributionStockListMapper.selectList(lambdaQueryWrapper);
@@ -2933,6 +2914,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 	@Override
 	public StockConfigInfoVO stockConfigList(StockupDTO stockupDTO) {
+		String typeService = stockupDTO.getTypeService();
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 		if (Func.isEmpty(myCurrentWarehouse)){
 			return null;
@@ -2990,31 +2972,74 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				log.info("###################库存品source_type字段缺失:{}",distributionStockListEntity.getIncomingBatch());
 			}
 		}
-
-
-
-		//  查询预约单的上的信息
 		StockConfigInfoVO stockConfigInfoVO = new StockConfigInfoVO();
-		DistributionReservationEntity reservationEntity = distributionReservationService.getById(stockupDTO.getReservationId()); //预约信息
-		stockConfigInfoVO.setCustomer(reservationEntity.getConsignee()); //客户0
-		stockConfigInfoVO.setAddress(reservationEntity.getDeliveryAddress()); //地址
-
-
-
-		List<StockConfigOrderPackageListVO> ls = new ArrayList<>();
 		//过滤出同物料库存品的ID信息
 		List<Long> stockListIds = distributionStockListEntities.stream().map(DistributionStockListEntity::getId).collect(Collectors.toList());
-		//查询该物料的库存品信息
+		List<StockConfigOrderPackageListVO> ls = new ArrayList<>();
-		List<DistributionReservationStocklistEntity> reservationStocklistEntityList = distributionReservationStocklistService.list(Wrappers.<DistributionReservationStocklistEntity>query().lambda()
+		if(typeService.equals(StockupTypeConstant.ziti.getValue())){
-			.eq(DistributionReservationStocklistEntity::getReservationId, stockupDTO.getReservationId())
+			//自提
-			.in(DistributionReservationStocklistEntity::getStocklistId, stockListIds)
+			//  查询预约单的上的信息
-			.notIn(DistributionReservationStocklistEntity::getStockListStatus, 2)
+			List<DistrilbutionBillStockEntity> list = distrilbutionBillStockService.list(Wrappers.<DistrilbutionBillStockEntity>query().lambda().
-		);
+				eq(DistrilbutionBillStockEntity::getBillLadingId, stockupDTO.getReservationId())
-		stockConfigInfoVO.setRealityNum(0);
+				.apply("order_status in (1,2)")
-		if (Func.isNotEmpty(reservationStocklistEntityList)){
+			);//预约信息
-			int realityNum = reservationStocklistEntityList.stream().mapToInt(DistributionReservationStocklistEntity::getRealityNum).sum();
+			if(!list.isEmpty()){
-			stockConfigInfoVO.setRealityNum(realityNum); //地址
+				DistributionStockArticleEntity byId = distributionStockArticleService.getById(list.get(0).getStockArticleId());
+				if(ObjectUtils.isNotNull(byId)){
+					stockConfigInfoVO.setCustomer(byId.getCustomerName()); //客户0
+					stockConfigInfoVO.setAddress(byId.getCustomerAddress()); //地址
+				}
 
+			}
+			//查询该物料的库存品信息
+			List<DistributionDeliveryDetailsEntity> detailsEntityList = distributionDeliveryDetailsService.list(Wrappers.<DistributionDeliveryDetailsEntity>query().lambda()
+				.eq(DistributionDeliveryDetailsEntity::getBillLadingId, stockupDTO.getReservationId())
+				.in(DistributionDeliveryDetailsEntity::getStockListId, stockListIds)
+				.apply("inventory_status in (1,2)")
+			);
+
+			stockConfigInfoVO.setRealityNum(0);
+			if (Func.isNotEmpty(detailsEntityList)){
+				int realityNum = detailsEntityList.stream().mapToInt(DistributionDeliveryDetailsEntity::getRealityQuantity).sum();
+				stockConfigInfoVO.setRealityNum(realityNum); //已备数量
+			}
+		}else{
+			//  查询预约单的上的信息
+			DistributionReservationEntity reservationEntity = distributionReservationService.getById(stockupDTO.getReservationId()); //预约信息
+			stockConfigInfoVO.setCustomer(reservationEntity.getConsignee()); //客户0
+			stockConfigInfoVO.setAddress(reservationEntity.getDeliveryAddress()); //地址
+//			List<StockConfigOrderPackageListVO> ls = new ArrayList<>();
+
+			//查询该物料的库存品信息
+			List<DistributionReservationStocklistEntity> reservationStocklistEntityList = distributionReservationStocklistService.list(Wrappers.<DistributionReservationStocklistEntity>query().lambda()
+				.eq(DistributionReservationStocklistEntity::getReservationId, stockupDTO.getReservationId())
+				.in(DistributionReservationStocklistEntity::getStocklistId, stockListIds)
+				.notIn(DistributionReservationStocklistEntity::getStockListStatus, 2)
+			);
+			stockConfigInfoVO.setRealityNum(0);
+			if (Func.isNotEmpty(reservationStocklistEntityList)){
+				int realityNum = reservationStocklistEntityList.stream().mapToInt(DistributionReservationStocklistEntity::getRealityNum).sum();
+				stockConfigInfoVO.setRealityNum(realityNum); //地址
+
+			}
+		/*	LambdaQueryWrapper<DistributionStockEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.eq(DistributionStockEntity::getReservationId, stockupDTO.getReservationId());
+			lambdaQueryWrapper.eq(DistributionStockEntity::getAllocationId, stockupDTO.getAllocationId());
+			lambdaQueryWrapper.eq(DistributionStockEntity::getType, 2);
+			lambdaQueryWrapper.eq(DistributionStockEntity::getStockupId, stockupDTO.getStockupId());
+			lambdaQueryWrapper.in(DistributionStockEntity::getStockListId, stockListIds);
+			List<DistributionStockEntity> distributionStockEntities = distributionStockMapper.selectList(lambdaQueryWrapper);
+			for (DistributionStockEntity distributionStockEntity : distributionStockEntities) {
+				StockConfigOrderPackageListVO stockConfigOrderPackageListVO = new StockConfigOrderPackageListVO();
+				stockConfigOrderPackageListVO.setCode(distributionStockEntity.getCoding());
+				stockConfigOrderPackageListVO.setNum(1);
+				stockConfigOrderPackageListVO.setCreateTime(distributionStockEntity.getCreateTime());
+				// 查询批次
+				DistributionStockListEntity distributionStockListEntity = distributionStockListMapper.selectById(distributionStockEntity.getStockListId());
+				stockConfigOrderPackageListVO.setIncomingBatch(distributionStockListEntity.getIncomingBatch());
+				ls.add(stockConfigOrderPackageListVO);
+			}
+			stockConfigInfoVO.setStockConfigOrderPackageListVOS(ls);*/
 		}
 		LambdaQueryWrapper<DistributionStockEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(DistributionStockEntity::getReservationId, stockupDTO.getReservationId());
@@ -3033,7 +3058,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			stockConfigOrderPackageListVO.setIncomingBatch(distributionStockListEntity.getIncomingBatch());
 			ls.add(stockConfigOrderPackageListVO);
 		}
-
 		stockConfigInfoVO.setStockConfigOrderPackageListVOS(ls);
 		return stockConfigInfoVO;
 

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

@@ -344,7 +344,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			//新增
 //			distrilbutionBillLading.setConditions("1");
 			distrilbutionBillLading.setStockupCode(distributionReservationService.bianMa());
-			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
 			String format = dateFormat.format(new Date());
 			distrilbutionBillLading.setPickupBatch("ZT"+format);//批次号
 			BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
@@ -1512,7 +1512,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				billLadingEntity.setConditions("20");
 				baseMapper.updateById(billLadingEntity);
 			}*/
-			return  Resp.scanSuccess( "签收成功","签收成功");
+			log.info(coding+" > > 签收成功!!");
+			return  Resp.scanSuccess( "签收成功","");
 		}
 	}