Merge branch 'dev' into pre-production

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

@@ -59,7 +59,7 @@ public class PushInstallDTO implements Serializable {
 		private String level3_type;
 		private String materials;
 		private String order_no;
-		private String num;
+		private String number;
 
 
 	 }

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

@@ -463,6 +463,7 @@
         INNER JOIN logpm_distribution_reservation AS ldr ON ldr.id = lds.reservation_id
         <where>
             ldr.reservation_status != '40'
+            AND ldr.is_deleted = 0
             <if test="id!='' and id != null">
                 and lddl.id = #{id}
             </if>

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

@@ -118,6 +118,7 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
     Long selectIdByOrderId(Long id);
 
 	Integer updateloadByReservationId(@Param("deliveryId") Long deliveryId,@Param("reservationId") Long reservationId,@Param("nub") Integer nub);
+	Integer updateLnumAndSnumByReservationId(@Param("deliveryId") Long deliveryId,@Param("reservationId") Long reservationId,@Param("nub1") Integer nub1,@Param("nub2") Integer nub2);
 
 	Integer updateloadreduceByReservationId(@Param("deliveryId") Long deliveryId,@Param("reservationId") Long reservationId,@Param("nub") Integer nub);
 	/**

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

@@ -46,6 +46,12 @@
         UPDATE logpm_distribution_signfor lds set lds.loaded_number = ( lds.loaded_number + #{nub} ) WHERE
         lds.is_deleted =0 and lds.reservation_id = #{reservationId} and lds.delivery_id = #{deliveryId}
     </update>
+    <update id="updateLnumAndSnumByReservationId">
+        UPDATE logpm_distribution_signfor lds set lds.loaded_number = ( lds.loaded_number + #{nub1} ),lds.received_quantity = ( lds.received_quantity + #{nub2}
+        ) WHERE
+        lds.is_deleted =0 and lds.reservation_id = #{reservationId} and lds.delivery_id = #{deliveryId}
+    </update>
+
     <update id="updateloadByinvn">
         UPDATE logpm_distribution_signfor lds set lds.loadedin_number = ( lds.loadedin_number + #{nub} ) WHERE
         lds.is_deleted =0 and lds.reservation_id = #{reservationId} and lds.delivery_id = #{deliveryId}

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

@@ -3064,7 +3064,8 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 									orderDetail.setLevel1_type(distributionParcelListEntity.getFirsts());
 									orderDetail.setLevel2_type(distributionParcelListEntity.getSecond());
 									orderDetail.setLevel3_type(distributionParcelListEntity.getThirdProduct());
-									orderDetail.setNum(distributionParcelListEntity.getQuantity() + "");
+									orderDetail.setPackage_code(distributionParcelListEntity.getOrderPackageCode());
+									orderDetail.setNumber(distributionParcelListEntity.getQuantity() + "");
 									orderDetailList.add(orderDetail);
 								}
 							}
@@ -3081,7 +3082,8 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 								orderDetail.setLevel1_type(distributionParcelNumberVO.getFirsts());
 //								orderDetail.setLevel2_type(distributionParcelListEntity.getSecond());
 //								orderDetail.setLevel3_type(distributionParcelListEntity.getThirdProduct());
-								orderDetail.setNum(distributionParcelNumberVO.getReservationNum() + "");
+								orderDetail.setNumber(distributionParcelNumberVO.getReservationNum() + "");
+								orderDetail.setPackage_code(distributionStockArticleEntity.getOrderCode());
 								orderDetailList.add(orderDetail);
 							}
 						}
@@ -3132,7 +3134,8 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 //							orderDetail.setLevel2_type(distributionParcelListEntity.getSecond());
 //							orderDetail.setLevel3_type(distributionParcelListEntity.getThirdProduct());
 //							orderDetail.setLevel3_type(distributionParcelListEntity.getThirdProduct());
-								orderDetail.setNum(disStockListDetailEntity.getNum() + "");
+								orderDetail.setNumber(disStockListDetailEntity.getNum() + "");
+								orderDetail.setPackage_code(disStockListDetailEntity.getStockPackageCode());
 								orderDetailList.add(orderDetail);
 							}
 						}

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

@@ -1069,6 +1069,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				.in(DistributionLoadscanEntity::getPackageId, reservationZeroPackageEntity.getParcelListId())
 				.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
 			);
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.sss");
 			if (Func.isEmpty(loadscanEntity)) {
 				if ("1".equals(deliveryListEntity.getKind())) {
 					//自主配送
@@ -1089,7 +1090,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				d = distributionParcelNumberEntity.getDeliveryQuantity() - reservationZeroPackageEntity.getQuantity();
 				//未进行装车操作
 				DistributionLoadscanEntity unLoadscanEntity = new DistributionLoadscanEntity();
-				SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.sss");
 				unLoadscanEntity.setScanStatus(LoadingStatusConstant.buluzhuangche.getValue());
 				unLoadscanEntity.setIsInsert(2);
 				unLoadscanEntity.setLoadingId(loadingId.toString());
@@ -1140,7 +1140,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				c = distributionParcelNumberEntity.getOutboundQuantity() - loadscanEntity.getReceivedQuantity() + reservationZeroPackageEntity.getQuantity();
 				d = distributionParcelNumberEntity.getDeliveryQuantity() + loadscanEntity.getReceivedQuantity() - reservationZeroPackageEntity.getQuantity();
 				//存在装车操作
+				//计算差值
+				int i1 = reservationZeroPackageEntity.getQuantity() - loadscanEntity.getLoadedNub();
 				loadscanEntity.setSigningUser(user.getNickName());
+				loadscanEntity.setSigningUserId(user.getUserId());
+				loadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
 				loadscanEntity.setIsSignfor(2);
 				loadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
 //				loadscanEntity.setSigningTime(new Date().toString());
@@ -1153,6 +1157,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				distributionParcelNumberEntity.setSigninQuantity(b);
 				distributionParcelNumberEntity.setOutboundQuantity(c);
 				distributionParcelNumberEntity.setDeliveryQuantity(d);
+				//更新装车信息
+				//获取计划和当前装车的差值
+				//更新装车数量
+				distributionSignforMapper.updateLnumAndSnumByReservationId(loadscanEntity.getDeliveryId(),loadscanEntity.getReservationId(),i1,reservationZeroPackageEntity.getQuantity());
 			}
 			distributionParcelListService.maintenanceZeroPackageInfo(distributionParcelNumberEntity.getParcelListId(), stockArticleEntity.getWarehouseId());
 
@@ -1332,6 +1340,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			//存在装车操作
 			loadscanEntity.setSigningUser(user.getNickName());
 			loadscanEntity.setIsSignfor(2);
+			loadscanEntity.setIsZero(1);
 			loadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
 //				loadscanEntity.setSigningTime(new Date().toString());
 			loadscanEntity.setReceivedQuantity(reservationZeroPackageEntities.getQuantity());

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.java

@@ -287,4 +287,11 @@ public interface WarehouseIndexMapper {
 	 * @return
 	 */
 	String findBillLadingPlanNumByDay(@Param("param")IndexDTO indexDTO);
+
+	/**
+	 *查询当月自提计划数
+	 * @param indexDTO
+	 * @return
+	 */
+	String findBillLadingPlanNumByMonth(@Param("param")IndexDTO indexDTO);
 }

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml

@@ -887,6 +887,22 @@
         </where>
     </select>
     <select id="findBillLadingPlanNumByDay" resultType="java.lang.String">
+        SELECT
+        count(1)  AS num
+        FROM
+        logpm_distrilbution_bill_lading
+        <where>
+            is_deleted = 0
+            AND DATE_FORMAT( create_time, '%y%m%d' ) = DATE_FORMAT( #{param.dayStr}, '%y%m%d' )
+            <if test="param.warehouseIds != null">
+                AND warehouse_id
+                <foreach collection="param.warehouseIds" item="item" open="in (" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="findBillLadingPlanNumByMonth" resultType="java.lang.String">
         SELECT
         count(1)  AS num
         FROM

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java

@@ -408,10 +408,21 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
 			String signScale = multiply.toString();
 			indexBillLadingSignforDayDataVO.setClerkSignforScale(signScale);
 		}
+		//查询当天计划数
+		String dayBillLadingPlanNum = warehouseIndexMapper.findBillLadingPlanNumByDay(indexDTO);
+
+
 		//查询当天文员复核数
 		String dayBillLadingSignforNum = warehouseIndexMapper.findBillLadingSignForNumByDay(indexDTO);
 		indexBillLadingSignforDayDataVO.setClerkSignNum(dayBillLadingSignforNum);
-
+		if (!"0".equals(dayBillLadingPlanNum)  && !"0".equals(dayBillLadingSignforNum) ) {
+			//计算当月的超时签收率
+			BigDecimal bd1 = new BigDecimal(dayBillLadingSignforNum);
+			BigDecimal bd2 = new BigDecimal(dayBillLadingPlanNum);
+			BigDecimal multiply = bd1.divide(bd1.add(bd2),1, BigDecimal.ROUND_CEILING);
+			String signScale = multiply.toString();
+			indexBillLadingSignforDayDataVO.setClerkOverTimeScale(signScale);
+		}
 		//查询当天签收超时数
 		String dayBillLadingverTimeNum = warehouseIndexMapper.findBillLadingOverTimeNumByDay(indexDTO);
 		indexBillLadingSignforDayDataVO.setClerkOverTimeSignfoNum(dayBillLadingverTimeNum);
@@ -443,7 +454,7 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
 		String monthBillLadingOverTimeNum = warehouseIndexMapper.findBillLadingOverTimeNumByDay(indexDTO);
 		indexBillLadingSignforMonthDataVO.setClerkOverTimeSignfoNum(monthBillLadingOverTimeNum);
 		//查询当月计划总数
-		String monthBillLadingPlanNum = warehouseIndexMapper.findBillLadingPlanNumByDay(indexDTO);
+		String monthBillLadingPlanNum = warehouseIndexMapper.findBillLadingPlanNumByMonth(indexDTO);
 		if (!"0".equals(monthBillLadingOverTimeNum)  && !"0".equals(monthBillLadingPlanNum) ) {
 			//计算当月的超时签收率
 			BigDecimal bd1 = new BigDecimal(monthBillLadingOverTimeNum);