Merge remote-tracking branch 'origin/dev' into dev

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

@@ -806,23 +806,24 @@
     </select>
             <select id="selectAppDeliveryInventoryPage" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
                 SELECT
-                distinct ldsl.id id,
+                ldsl.id id,
                 ldsl.sku sku,
                 ldsl.cargo_number cargoNumber,
                 ldsl.description_goods descriptionGoods,
                 ldl.signfor_state signforState,
                 ldl.order_package_code orderPackageCode,
                 lbm.specification specification,
-                lbm.logpm_unit logpmUnit
+                lbm.logpm_unit logpmUnit,
+                if(ldl.id is not null,IF(ldl.signfor_state = 2,1,0),0) AS signforNub,
+                ldsld.stock_package_code AS orderPackageCode
                 FROM
-                logpm_distribution_reservation ldr
+                logpm_dis_stock_list_detail AS ldsld
-                join logpm_distribution_reservation_stocklist ldrs on ldr.id = ldrs.reservation_id
+                LEFT JOIN logpm_distribution_stock_list AS ldsl ON ldsld.stock_list_id = ldsl.id
-                join logpm_distribution_stock_list ldsl on ldsl.id =  ldrs.stocklist_id
+                LEFT JOIN logpm_distribution_loadscaninvn ldl ON ldsl.id = ldl.inventory_id AND ldsld.id = ldl.inventory_package_id
-                LEFT JOIN logpm_distribution_loadscaninvn ldl on ldsl.id = ldl.inventory_id
+                LEFT JOIN logpm_basicdata_material lbm ON ldsl.material_id = lbm.id
-                left join logpm_basicdata_material lbm on ldsl.material_id = lbm.id
                 <where>
-                    ldr.is_deleted = 0
+                    ldsld.is_deleted = 0
-                    AND ldr.id = #{param.reservationId}
+                    AND ldsld.reservation_id = #{param.reservationId}
                 </where>
             </select>
             <select id="selectListbyink" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">

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

@@ -527,11 +527,12 @@
         ) trays ,
         (select COUNT(DISTINCT id)
         from logpm_distrilbution_bill_stock
-        where bill_lading_id = ldsi.reservation_id and order_status in (1,2) ) orderNum,
+        where bill_lading_id = ldsi.reservation_id and order_status in (1,3) ) orderNum,
         (
         select COUNT(DISTINCT ldbs.id)
         from logpm_distrilbution_bill_package ldbs
         where ldbs.bill_lading_id = ldsi.reservation_id
+        AND ldbs.packet_bar_status IN (1,3)
         ) planNum,
         (
         select SUM(lddd.quantity)
@@ -724,35 +725,39 @@
 
 
     <select id="selectStockupClientInfoSelf" resultType="com.logpm.distribution.vo.DistributionStockupListVO">
-        select DISTINCT ldbs.bill_lading_id reservationId, GROUP_CONCAT(DISTINCT ldsa.mall_name SEPARATOR ',') customer,
+        SELECT DISTINCT
-        (
+        ldbs.bill_lading_id reservationId,
-        select count(id)
+        GROUP_CONCAT( DISTINCT ldsa.mall_name SEPARATOR ',' ) customer,
-        from logpm_distrilbution_bill_stock
+        ( SELECT count( id ) FROM logpm_distrilbution_bill_stock WHERE bill_lading_id = ldsi.reservation_id AND order_status IN ( 1, 3 ) ) orderNum,
-        where bill_lading_id = ldsi.reservation_id
-        ) orderNum,
-
         (
-        select count(ldpl.id)
+        SELECT
-        from logpm_distrilbution_bill_stock ldbs
+        IFNULL( sum( ldbl.packet_number ), 0 )
-        LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id =ldbs.stock_article_id
+        FROM
-        where ldbs.bill_lading_id = ldsi.reservation_id
+        logpm_distrilbution_bill_package ldbl
+        WHERE
+        ldbl.bill_lading_id = ldsi.reservation_id
+        AND ldbl.packet_bar_status IN ( 1, 3 )
+        ) + (
+        SELECT
+        IFNULL( sum( ldrzp.quantity ), 0 )
+        FROM
+        logpm_distribution_reservation_zero_package AS ldrzp
+        WHERE
+        ldrzp.reservation_id = ldsi.reservation_id
+        AND ldrzp.type = 3
+        AND ldrzp.zero_package_status IN ( 1, 3 )
         ) planNum,
-        (
+        ( SELECT COUNT( id ) FROM logpm_distribution_stock WHERE bill_lading_id = ldbs.bill_lading_id ) stockupNum,
-        select COUNT(id)
+        lds.stockup_status stockupStatus,
-        from logpm_distribution_stock
+        lds.type_service typeService,
-        where bill_lading_id = ldbs.bill_lading_id
+        ( SELECT IFNULL( sum( lddd.quantity ), 0 ) FROM logpm_distribution_delivery_details lddd WHERE lddd.bill_lading_id = ldsi.reservation_id ) inventoryNub,
-        ) stockupNum,lds.stockup_status stockupStatus ,lds.type_service typeService,
+        GROUP_CONCAT( DISTINCT ldsa.mall_name ) mallName
-        (
+        FROM
-        SELECT sum(lddd.quantity)
+        logpm_distribution_stockup lds
-        from logpm_distribution_delivery_details lddd
+        LEFT JOIN logpm_distribution_stockup_info ldsi ON lds.id = ldsi.stockup_id
-        where lddd.bill_lading_id = ldsi.reservation_id
+        LEFT JOIN logpm_distrilbution_bill_stock ldbs ON ldsi.reservation_id = ldbs.bill_lading_id
-        ) inventoryNub,
+        LEFT JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldbs.stock_article_id
-        GROUP_CONCAT(DISTINCT ldsa.mall_name) mallName
+        LEFT JOIN logpm_distribution_parcel_list ldpl ON ldsa.id = ldpl.stock_article_id
-        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
-        LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldbs.stock_article_id
-        LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
         <where>
             lds.id = #{param.stockupId}
         </where>

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

@@ -2423,19 +2423,34 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				.eq(DisStockListDetailEntity::getStockPackageCode, distrilbutionloadingscanDTO.getBarcode())
 				.ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
 			);
+			//查询当前客户的所有异常情况
 			List<DistributionLoadscanAbnormalEntity> abnormalEntities = distributionLoadscanAbnormalService.list(Wrappers.<DistributionLoadscanAbnormalEntity>query().lambda()
 				.eq(DistributionLoadscanAbnormalEntity::getPackageCode, distrilbutionloadingscanDTO.getBarcode())
-					.eq(DistributionLoadscanAbnormalEntity::getAuditingStatus, 1)
+//					.eq(DistributionLoadscanAbnormalEntity::getAuditingStatus, 1)
 				//修改 状态
 			);
 			if (!abnormalEntities.isEmpty()) {
-				boolean flag = abnormalEntities.stream().allMatch(a -> deliveryListEntity.getId().equals(a.getDeliveryListId()) );
+				//判断此包件的异常是否是当前扫描车次和客户
+				//首先判断存在异常是否不属于当前车次和客户
+				boolean flag = abnormalEntities.stream().allMatch(a -> !deliveryListEntity.getId().equals(a.getDeliveryListId()) && !distrilbutionloadingscanDTO.getReservationId().equals(a.getReservationId()));
 				if (flag){
-					return Resp.scanFail("包件已存在异常", "包件已存在异常");
+					//该异常属于其他车次
+				    String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(","));
+					log.info("包件已在其他车次存在异常 >>>>当前车次:{},其他车次:{}",deliveryListEntity.getTrainNumber(),collect);
+					return Resp.scanFail("包件已在其他车次存在异常", "包件已在其他车次存在异常");
 				}
-				String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(","));
+				//判断具体的装车信息
-				log.info("包件已在其他车次存在异常 >>>>当前车次:{},其他车次:{}",deliveryListEntity.getTrainNumber(),collect);
+
-				return Resp.scanFail("包件已在其他车次存在异常", "包件已在其他车次存在异常");
+
+
+//				boolean flag = abnormalEntities.stream().filter(f->f.getAuditingStatus() == 1).allMatch(a -> deliveryListEntity.getId().equals(a.getDeliveryListId()) && distrilbutionloadingscanDTO.getReservationId().equals(a.getReservationId()));
+//				if (flag){
+//					//存在异常  进行异常签收还是异常装车区分
+//					return Resp.scanFail("包件已存在异常", "包件已存在异常");
+//				}
+//				String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(","));
+//				log.info("包件已在其他车次存在异常 >>>>当前车次:{},其他车次:{}",deliveryListEntity.getTrainNumber(),collect);
+//				return Resp.scanFail("包件已在其他车次存在异常", "包件已在其他车次存在异常");
 			}
 			if (Func.isNotEmpty(list)) {
 				//满足条件此码必定为库存品
@@ -3874,7 +3889,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			}
 
 		}
-
 		return orderVos;
 
 	}

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

@@ -1412,9 +1412,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				signPushDataUnitDTO.setSignUserName(user.getName());
 				if (ObjectUtils.isNotEmpty(user.getPhone())){
 					signPushDataUnitDTO.setSignUserPhone(user.getPhone());
+					signPushDataUnitDTO.setPhone(user.getPhone());
 				}else {
 					if (ObjectUtils.isNotEmpty(user.getAccount())){
 						signPushDataUnitDTO.setSignUserPhone(user.getAccount());
+						signPushDataUnitDTO.setPhone(user.getPhone());
 					}else {
 						log.info("用户无电话号码且账号信息为空>>用户名称:{}",user.getName());
 					}