Merge branch 'dev' into pre-production

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataClientController.java

@@ -129,13 +129,21 @@ public class BasicdataClientController extends BladeController {
 		queryWrapper.orderByDesc("create_time");
 		IPage<BasicdataClientEntity> pages = basicdataClientService.page(Condition.getPage(query), queryWrapper);
 		pages.getRecords().forEach(i -> {
-			List<BasicdataStoreBusinessEntity> list = basicdataStoreBusinessService.list(Wrappers.<BasicdataStoreBusinessEntity>query().lambda().eq(BasicdataStoreBusinessEntity::getClientId, i.getId()));
+			List<BasicdataStoreBusinessEntity> list = basicdataStoreBusinessService.list(Wrappers.<BasicdataStoreBusinessEntity>query().lambda()
+				.eq(BasicdataStoreBusinessEntity::getClientId, i.getId()));
 			i.setTypeServiceBusiness(list);
 			//查询客户绑定第一位联系人
-			List<BasicdataStoreContactEntity> listed = basicdataStoreContactService.list(Wrappers.<BasicdataStoreContactEntity>query().lambda().eq(BasicdataStoreContactEntity::getShopId, i.getId()));
+			List<BasicdataStoreContactEntity> listed = basicdataStoreContactService.list(Wrappers.<BasicdataStoreContactEntity>query().lambda()
+				.eq(BasicdataStoreContactEntity::getShopId, i.getId()));
 			if (Func.isNotEmpty(listed)) {
+				List<BasicdataStoreContactEntity> collect = listed.stream().filter(f -> Func.isEmpty(f.getCreateTime())).collect(Collectors.toList());
+				if (Func.isNotEmpty(collect)){
+					System.out.println("客户无创建时间"+collect);
+				}
 				String string = listed.stream().sorted(Comparator.comparing(BasicdataStoreContactEntity::getCreateTime)).findFirst().map(BasicdataStoreContactEntity::getLinkman).get();
+				String phone = listed.stream().sorted(Comparator.comparing(BasicdataStoreContactEntity::getCreateTime)).findFirst().map(BasicdataStoreContactEntity::getPhone).get();
 				i.setLinkman(string);
+				i.setPhone(phone);
 			}
 			List<String> collect = list.stream().filter(f -> Func.isNotEmpty(f.getMold())).map(BasicdataStoreBusinessEntity::getMold).collect(Collectors.toList());
 			if (collect.size() > 0) {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java

@@ -22,11 +22,17 @@ public class DistributionStockArticleOweDTO extends DistributionStockArticleEnti
 	private String waybillNum; //订单号
 	private List<String> waybillNumList;
 	private String waybillNumLike;
+	private String warehouseName;
+	private String deliveryListInfo;
+	private String driverName;
+	private String examineUserNames;
+	private String reservationInfo;
 	private String ids;
 	private List<String> idsList;
 	private String idsLike;
 	private String reservation;
 	private String startDate;
 	private String entDate;
+	private String signinTime;
 	private List<Long> warehouseIdList;
 }

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

@@ -67,7 +67,7 @@ public interface DistributionDeliveryDetailsMapper extends BaseMapper<Distributi
 	 * @param coding
 	 * @return
 	 */
-	DistrilbutionBillLadingInventoryAppVO listCode(@Param("billLadingId") String billLadingId,@Param("coding") String coding);
+	List<DistrilbutionBillLadingInventoryAppVO> listCode(@Param("billLadingId") String billLadingId,@Param("coding") String coding);
 
     IPage<DistributionBillInventoryVO> getBillOrderInventory(IPage<Object> page, @Param("param") DistributionDeliveryDetailsEntity deliveryDetails);
 

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

@@ -1201,41 +1201,41 @@
         <where>
             ldsa.order_status in ('70','80')
             <if test="param.waybillNumber != null and param.waybillNumber != ''">
-               AND ldsa.waybill_number like concat("%",#{param.waybillNumber},"%"})
+               AND ldsa.waybill_number like concat("%",#{param.waybillNumber},"%")
             </if>
             <if test="param.serviceNumber != null and param.serviceNumber != ''">
-                AND ldsa.service_umber like concat("%",#{param.serviceNumber},"%"})
+                AND ldsa.service_umber like concat("%",#{param.serviceNumber},"%")
             </if>
             <if test="param.orderCode != null and param.orderCode != ''">
-                AND  ldsa.order_code like concat("%",#{param.orderCode},"%"})
+                AND  ldsa.order_code like concat("%",#{param.orderCode},"%")
             </if>
             <if test="param.warehouseName != null and param.warehouseName != ''">
-                AND ldsa.warehouse like concat("%",#{param.warehouseName},"%"})
+                AND ldsa.warehouse like concat("%",#{param.warehouseName},"%")
             </if>
             <if test="param.mallName != null and param.mallName != ''">
-                AND ldsa.mall_mame like concat("%",#{param.mallName},"%"})
+                AND ldsa.mall_mame like concat("%",#{param.mallName},"%")
             </if>
             <if test="param.brand != null and param.brand != ''">
-                AND ldsa.brand like concat("%",#{param.brand},"%"})
+                AND ldsa.brand like concat("%",#{param.brand},"%")
             </if>
             <if test="param.consigneePerson != null and param.consigneePerson != ''">
-                AND ldsa.consignee_person like concat("%",#{param.consigneePerson},"%"})
+                AND ldsa.consignee_person like concat("%",#{param.consigneePerson},"%")
             </if>
             <if test="param.consigneeUnit != null and param.consigneeUnit != ''">
-                AND ldsa.consignee_unit like concat("%",#{param.consigneeUnit},"%"})
+                AND ldsa.consignee_unit like concat("%",#{param.consigneeUnit},"%")
             </if>
             <if test="param.deliveryListInfo != null and param.deliveryListInfo != ''">
-                AND m.mssg like concat("%",#{param.deliveryListInfo},"%"})
+                AND m.mssg like concat("%",#{param.deliveryListInfo},"%")
             </if>
             <if test="param.driverName != null and param.driverName != ''">
-                AND m.driverName like concat("%",#{param.driverName},"%"})
+                AND m.driverName like concat("%",#{param.driverName},"%")
             </if>
             <if test="param.examineUserNames != null and param.examineUserNames != ''">
-                AND m.examine_user_name like concat("%",#{param.examineUserNames},"%"})
+                AND m.examine_user_name like concat("%",#{param.examineUserNames},"%")
             </if>
 
             <if test="param.reservationInfo != null and param.reservationInfo != ''">
-                AND t.msg like concat("%",#{param.reservationInfo},"%"})
+                AND t.msg like concat("%",#{param.reservationInfo},"%")
             </if>
             <if test="param.warehouseId != null and param.warehouseId != ''">
                 AND ldsa.warehouse_id = #{param.warehouseId}

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

@@ -61,7 +61,7 @@ public interface IDistributionDeliveryDetailsService extends BaseService<Distrib
 	 */
     DistributionDeliveryDetailsVO oneListNum(Long billLadingId);
 
-	DistrilbutionBillLadingInventoryAppVO listCode(String billLadingId, String coding);
+	List<DistrilbutionBillLadingInventoryAppVO> listCode(String billLadingId, String coding);
 
 	/**
 	 * 自提库存品查询

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

@@ -77,7 +77,7 @@ public class DistributionDeliveryDetailsServiceImpl extends BaseServiceImpl<Dist
 	}
 
 	@Override
-	public DistrilbutionBillLadingInventoryAppVO listCode(String billLadingId, String coding) {
+	public List<DistrilbutionBillLadingInventoryAppVO> listCode(String billLadingId, String coding) {
 		return baseMapper.listCode(billLadingId,coding) ;
 	}
 

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

@@ -1807,27 +1807,94 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			//扫描
 			if ("1".equals(type)) {
 				//库存品
-				DistrilbutionBillLadingInventoryAppVO inventoryAppVO = distributionDeliveryDetailsService.listCode(String.valueOf(billLadingId), String.valueOf(coding));
+				List<DistrilbutionBillLadingInventoryAppVO> inventoryAppVO = distributionDeliveryDetailsService.listCode(String.valueOf(billLadingId), String.valueOf(coding));
 				if (ObjectUtils.isNotNull(inventoryAppVO)) {
-					//查询签收数量
-					List<DistributionBillLadingScanEntity> list = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
-						.eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingId)
-						.eq(DistributionBillLadingScanEntity::getMaterialType, "1")
-						.eq(DistributionBillLadingScanEntity::getStockListId, inventoryAppVO.getStockListId())
+					List<Long> stocklistIds = inventoryAppVO.stream().map(DistrilbutionBillLadingInventoryAppVO::getStockListId).collect(Collectors.toList());
+					//查询该自提单所有的库存品包件信息
+					List<DisStockListDetailEntity> inventoryPackage = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
+						.eq(DisStockListDetailEntity::getReservationId, billLadingId)
+						.in(DisStockListDetailEntity::getStockListId, stocklistIds)
+						.ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
 					);
-					if (list.size() == inventoryAppVO.getQuantity() + 1) {
-						//修改完成状态
-						distributionAsyncService.getInventoryOrderSelfPickup(inventoryAppVO.getLdddId());
-					}
-					if (list.size() > inventoryAppVO.getQuantity()) {
-						return Resp.scanFail("已完成！", "已完成！！");
+					Long stockListId = 0L;
+					if (Func.isNotEmpty(inventoryPackage)){
+						//检测库存品包件是否都已经完成备货
+						boolean flag = inventoryPackage.stream().anyMatch(f -> Func.isEmpty(f.getStockPackageCode()));
+						if (!flag){
+							return Resp.scanFail("库存品备货未完成，请联系库管人员！", "库存品备货未完成，请联系库管人员");
+						}
+						//校验包件李彪是否存在满足码值的包件
+						List<DisStockListDetailEntity> collect = inventoryPackage.stream().filter(f -> coding.equals(f.getStockPackageCode())).collect(Collectors.toList());
+						if (collect.size() == 1){
+							//满足签收
+							distributionBillLadingScan.setPacketBarCode((String) coding);
+							distributionBillLadingScan.setStockListId(collect.get(0).getStockListId());
+							distributionBillLadingScan.setQuantity(1);
+							distributionBillLadingScanService.save(distributionBillLadingScan);
+							stockListId = collect.get(0).getStockListId();
+						}else {
+							//不满足签收，记录为什么不满足
+							if (collect.size() > 1){
+								//已备货库存品包件存在多条一样的
+
+								log.info("########################PDA签收库存品包件存在多条一样的备货码值:{}",coding);
+								return Resp.scanFail("系统无此编码！", "系统无此编码");
+							}else {
+								//备货库存品不存在
+								return Resp.scanFail("系统无此编码！", "系统无此编码");
+
+							}
+						}
+						Map<Long, List<DistrilbutionBillLadingInventoryAppVO>> stockListMap = inventoryAppVO.stream().collect(Collectors.groupingBy(DistrilbutionBillLadingInventoryAppVO::getStockArticleId));
+						//查询签收数量
+						List<DistributionBillLadingScanEntity> list = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
+							.eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingId)
+							.eq(DistributionBillLadingScanEntity::getMaterialType, "1")
+							.eq(DistributionBillLadingScanEntity::getStockListId, stockListId)
+						);
+						List<DistrilbutionBillLadingInventoryAppVO> billLadingInventoryAppVOS = stockListMap.get("stockListId");
+						if (Func.isNotEmpty(billLadingInventoryAppVOS)){
+							DistrilbutionBillLadingInventoryAppVO distrilbutionBillLadingInventoryAppVO = billLadingInventoryAppVOS.get(0);
+							if (list.size() == distrilbutionBillLadingInventoryAppVO.getQuantity()) {
+								//修改完成状态
+								distributionAsyncService.getInventoryOrderSelfPickup(distrilbutionBillLadingInventoryAppVO.getLdddId());
+							}
+							if (list.size() > distrilbutionBillLadingInventoryAppVO.getQuantity()) {
+								return Resp.scanFail("已完成！", "已完成！！");
+							}
+							//修改库存品签收
+							distributionAsyncService.getInventorySelfPickup(distrilbutionBillLadingInventoryAppVO.getStockArticleId());
+						}
+
+
+
+					}else {
+						return Resp.scanFail("库存品暂未备货请联系库管人员！", "库存品暂未备货请联系库管人员");
+
 					}
-					//修改库存品签收
-					distributionAsyncService.getInventorySelfPickup(inventoryAppVO.getStockArticleId());
-					distributionBillLadingScan.setPacketBarCode((String) coding);
-					distributionBillLadingScan.setStockListId(inventoryAppVO.getStockListId());
-					distributionBillLadingScan.setQuantity(1);
-					distributionBillLadingScanService.save(distributionBillLadingScan);
+
+
+
+//					//查询签收数量
+//					List<DistributionBillLadingScanEntity> list = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
+//						.eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingId)
+//						.eq(DistributionBillLadingScanEntity::getMaterialType, "1")
+//						.eq(DistributionBillLadingScanEntity::getStockListId, inventoryAppVO.getStockListId())
+//					);
+//					if (list.size() == inventoryAppVO.getQuantity() + 1) {
+//						//修改完成状态
+//						distributionAsyncService.getInventoryOrderSelfPickup(inventoryAppVO.getLdddId());
+//					}
+//					if (list.size() > inventoryAppVO.getQuantity()) {
+//						return Resp.scanFail("已完成！", "已完成！！");
+//					}
+//					//修改库存品签收
+//					distributionAsyncService.getInventorySelfPickup(inventoryAppVO.getStockArticleId());
+//
+//					distributionBillLadingScan.setPacketBarCode((String) coding);
+//					distributionBillLadingScan.setStockListId(inventoryAppVO.getStockListId());
+//					distributionBillLadingScan.setQuantity(1);
+//					distributionBillLadingScanService.save(distributionBillLadingScan);
 
 
 				} else {