1.修改签收数量

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

@@ -530,6 +530,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
 				distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub());
 				distributionLoadscanEntity.setScanStatus(2);
+				distributionLoadscanEntity.setReceivedQuantity(1);
 				distributionLoadscanEntity.setScanType("1");
 				distributionLoadscanEntity.setMsg("司机签收");
 				if (distributionSignfor.getIsClerk()){
@@ -557,12 +558,29 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (distributionLoadscanvnEntitiesopen.size() > 0) {
 			for (DistributionLoadscaninvnEntity distributionLoadscanEntity : distributionLoadscanvnEntitiesopen) {
 				//查询是否重复扫码
-				List<DistributionLoadscaninvnEntity> distributionLoadscanEntitiesflag = distributionLoadscaninvnMapper.selectList(new QueryWrapper<DistributionLoadscaninvnEntity>().lambda()
+				List<DistributionLoadscaninvnEntity> distributionLoadscaninvnEntitiesflag = distributionLoadscaninvnMapper.selectList(new QueryWrapper<DistributionLoadscaninvnEntity>().lambda()
 					.eq(DistributionLoadscaninvnEntity::getDeliveryId, distributionLoadscanEntity.getDeliveryId())
 					.eq(DistributionLoadscaninvnEntity::getOrderPackageCode, distributionLoadscanEntity.getOrderPackageCode())
 					.ne(DistributionLoadscaninvnEntity::getScanStatus, 1)
 					.eq(DistributionLoadscaninvnEntity::getSignforState,2)
 				);
+				if (distributionLoadscaninvnEntitiesflag.size() > 0) {
+					// 修改该记录
+					for (DistributionLoadscaninvnEntity loadscanEntity : distributionLoadscaninvnEntitiesflag) {
+						if (loadscanEntity.getSignforState() ==2)break;
+						distributionLoadscaninvnService.update(new UpdateWrapper<DistributionLoadscaninvnEntity>().lambda()
+							.eq(DistributionLoadscaninvnEntity::getDeliveryId, distributionLoadscanEntity.getDeliveryId())
+							.eq(DistributionLoadscaninvnEntity::getOrderPackageCode, distributionLoadscanEntity.getOrderPackageCode())
+							.set(DistributionLoadscaninvnEntity::getSigningTime,simpleDateFormat.format(new Date()))
+							.set(DistributionLoadscaninvnEntity::getSignforState,2)
+							.set(DistributionLoadscaninvnEntity::getReceivedQuantity,1)
+						);
+						//更新签收表的签收数量和装车数量
+						Integer j = distributionSignforMapper.updateSignforByReservationId(loadscanEntity.getDeliveryId(),loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
+					}
+//					distributionLoadscanService.update()
+					continue;
+				}
 				//依次插入该装车记录,设置车辆
 				if (null != distributionDeliverySelfEntity.getDriverId()) {
 					distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
@@ -571,6 +589,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub());
 				distributionLoadscanEntity.setScanStatus(2);
 				distributionLoadscanEntity.setScanType("1");
+				distributionLoadscanEntity.setReceivedQuantity(1);
 //				distributionLoadscanEntity.setOneClick(2);
 				distributionLoadscanEntity.setSignforState(2);
 				distributionLoadscanEntity.setOneQclick(2);