|
|
@ -1169,6 +1169,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution |
|
|
|
int c = 0; |
|
|
|
int c = 0; |
|
|
|
//冻结数
|
|
|
|
//冻结数
|
|
|
|
int d = 0; |
|
|
|
int d = 0; |
|
|
|
|
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.sss"); |
|
|
|
if (Func.isEmpty(loadscanEntity)) { |
|
|
|
if (Func.isEmpty(loadscanEntity)) { |
|
|
|
|
|
|
|
|
|
|
|
if ("1".equals(deliveryListEntity.getKind())) { |
|
|
|
if ("1".equals(deliveryListEntity.getKind())) { |
|
|
@ -1190,7 +1191,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution |
|
|
|
d = distributionParcelNumberDTO.getDeliveryQuantity() - reservationZeroPackageEntities.getQuantity(); |
|
|
|
d = distributionParcelNumberDTO.getDeliveryQuantity() - reservationZeroPackageEntities.getQuantity(); |
|
|
|
//未进行装车操作
|
|
|
|
//未进行装车操作
|
|
|
|
DistributionLoadscanEntity unLoadscanEntity = new DistributionLoadscanEntity(); |
|
|
|
DistributionLoadscanEntity unLoadscanEntity = new DistributionLoadscanEntity(); |
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.sss"); |
|
|
|
|
|
|
|
unLoadscanEntity.setScanStatus(LoadingStatusConstant.buluzhuangche.getValue()); |
|
|
|
unLoadscanEntity.setScanStatus(LoadingStatusConstant.buluzhuangche.getValue()); |
|
|
|
unLoadscanEntity.setIsInsert(2); |
|
|
|
unLoadscanEntity.setIsInsert(2); |
|
|
|
unLoadscanEntity.setLoadingId(loadingId.toString()); |
|
|
|
unLoadscanEntity.setLoadingId(loadingId.toString()); |
|
|
@ -1212,7 +1212,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution |
|
|
|
unLoadscanEntity.setLoadingId(driverPhone); |
|
|
|
unLoadscanEntity.setLoadingId(driverPhone); |
|
|
|
unLoadscanEntity.setScanType(LoadingStatusConstant.buluzhuangche.getValue()); |
|
|
|
unLoadscanEntity.setScanType(LoadingStatusConstant.buluzhuangche.getValue()); |
|
|
|
unLoadscanEntity.setScanTime(simpleDateFormat.format(new Date())); |
|
|
|
unLoadscanEntity.setScanTime(simpleDateFormat.format(new Date())); |
|
|
|
unLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date(System.currentTimeMillis() + (6 * 1000)))); |
|
|
|
unLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date())); |
|
|
|
unLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue()); |
|
|
|
unLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue()); |
|
|
|
unLoadscanEntity.setSigningUserId(user.getUserId()); |
|
|
|
unLoadscanEntity.setSigningUserId(user.getUserId()); |
|
|
|
unLoadscanEntity.setSigningUser(user.getNickName()); |
|
|
|
unLoadscanEntity.setSigningUser(user.getNickName()); |
|
|
@ -1248,6 +1248,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution |
|
|
|
loadscanEntity.setReceivedQuantity(reservationZeroPackageEntities.getQuantity()); |
|
|
|
loadscanEntity.setReceivedQuantity(reservationZeroPackageEntities.getQuantity()); |
|
|
|
loadscanEntity.setLoadedNub(reservationZeroPackageEntities.getQuantity()); |
|
|
|
loadscanEntity.setLoadedNub(reservationZeroPackageEntities.getQuantity()); |
|
|
|
loadscanEntity.setPackageNub(reservationZeroPackageEntities.getQuantity()); |
|
|
|
loadscanEntity.setPackageNub(reservationZeroPackageEntities.getQuantity()); |
|
|
|
|
|
|
|
loadscanEntity.setSigningTime(simpleDateFormat.format(new Date(System.currentTimeMillis() + (6 * 1000)))); |
|
|
|
loadscanEntity.setMsg("文员进行签收补录"); |
|
|
|
loadscanEntity.setMsg("文员进行签收补录"); |
|
|
|
distributionLoadscanService.updateById(loadscanEntity); |
|
|
|
distributionLoadscanService.updateById(loadscanEntity); |
|
|
|
distributionParcelNumberEntity.setHandQuantity(a); |
|
|
|
distributionParcelNumberEntity.setHandQuantity(a); |
|
|
|