|
|
@ -2975,7 +2975,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution |
|
|
|
loadscanEntity.setOrderId(parcelNumberEntity.getStockArticleId()); |
|
|
|
loadscanEntity.setOrderId(parcelNumberEntity.getStockArticleId()); |
|
|
|
loadscanEntity.setDeliveryId(distributionSignforEntity.getDeliveryId()); |
|
|
|
loadscanEntity.setDeliveryId(distributionSignforEntity.getDeliveryId()); |
|
|
|
loadscanEntity.setReservationId(distributionSignforEntity.getReservationId()); |
|
|
|
loadscanEntity.setReservationId(distributionSignforEntity.getReservationId()); |
|
|
|
loadscanEntity.setScanUser(user.getUserName()); |
|
|
|
loadscanEntity.setScanUser(user.getNickName()); |
|
|
|
loadscanEntity.setScanTime(simpleDateFormat.format(new Date())); |
|
|
|
loadscanEntity.setScanTime(simpleDateFormat.format(new Date())); |
|
|
|
loadscanEntity.setPackageNub(parcelNumberEntity.getReservationNum()); |
|
|
|
loadscanEntity.setPackageNub(parcelNumberEntity.getReservationNum()); |
|
|
|
loadscanEntity.setLoadedNub(parcelNumberEntity.getReservationNum()); |
|
|
|
loadscanEntity.setLoadedNub(parcelNumberEntity.getReservationNum()); |
|
|
@ -3058,10 +3058,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution |
|
|
|
loadscanEntity.setOrderId(parcelListEntity.getStockArticleId()); |
|
|
|
loadscanEntity.setOrderId(parcelListEntity.getStockArticleId()); |
|
|
|
loadscanEntity.setDeliveryId(distributionSignforEntity.getDeliveryId()); |
|
|
|
loadscanEntity.setDeliveryId(distributionSignforEntity.getDeliveryId()); |
|
|
|
loadscanEntity.setReservationId(distributionSignforEntity.getReservationId()); |
|
|
|
loadscanEntity.setReservationId(distributionSignforEntity.getReservationId()); |
|
|
|
loadscanEntity.setScanUser(user.getUserName()); |
|
|
|
loadscanEntity.setScanUser(user.getNickName()); |
|
|
|
loadscanEntity.setScanTime(signingTime); |
|
|
|
loadscanEntity.setScanTime(signingTime); |
|
|
|
loadscanEntity.setPackageNub(parcelListEntity.getQuantity()); |
|
|
|
loadscanEntity.setPackageNub(parcelListEntity.getQuantity()); |
|
|
|
loadscanEntity.setSigningUser(user.getUserName()); |
|
|
|
loadscanEntity.setSigningUser(user.getNickName()); |
|
|
|
loadscanEntity.setSigningUserId(user.getUserId()); |
|
|
|
loadscanEntity.setSigningUserId(user.getUserId()); |
|
|
|
if (Func.isNotEmpty(distributionDeliverySelfEntity.getDriverId())) { |
|
|
|
if (Func.isNotEmpty(distributionDeliverySelfEntity.getDriverId())) { |
|
|
|
loadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId()); |
|
|
|
loadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId()); |
|
|
@ -3116,7 +3116,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution |
|
|
|
loadscanEntities.setReceivedQuantity(parcelListEntity.getQuantity()); |
|
|
|
loadscanEntities.setReceivedQuantity(parcelListEntity.getQuantity()); |
|
|
|
loadscanEntities.setOneClick(1); |
|
|
|
loadscanEntities.setOneClick(1); |
|
|
|
loadscanEntities.setOneQclick(2); |
|
|
|
loadscanEntities.setOneQclick(2); |
|
|
|
loadscanEntities.setSigningUser(user.getUserName()); |
|
|
|
loadscanEntities.setSigningUser(user.getNickName()); |
|
|
|
loadscanEntities.setSigningUserId(user.getUserId()); |
|
|
|
loadscanEntities.setSigningUserId(user.getUserId()); |
|
|
|
loadscanEntities.setReceivedQuantity(parcelListEntity.getQuantity()); |
|
|
|
loadscanEntities.setReceivedQuantity(parcelListEntity.getQuantity()); |
|
|
|
loadscanEntities.setSigningTime(signingTime); |
|
|
|
loadscanEntities.setSigningTime(signingTime); |
|
|
|