零担PC签收BUG修复

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/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());