java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

feat(all): 配送模块 

1 修改配送签收复核时间不准确问题
fix-sign
zhaoqiaobo 2 months ago
parent
e537e67fdc
commit
7483e4c255
1 changed files with 45 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 82
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

82
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
Unescape View File

@ -872,7 +872,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
nodeFanoutMsg.setWarehouse(reservationEntity.getWarehouseName());
nodeFanoutMsg.setWarehouseId(reservationEntity.getWarehouseId());
nodeFanoutMsg.setOperator(AuthUtil.getNickName());
nodeFanoutMsg.setOperatorTime(reservationEntity.getUpdateTime());
nodeFanoutMsg.setOperatorTime(new Date());
// DistributionTaskVO taskVO = buildDistributionTaskVO(distributionDeliveryListEntity, AuthUtil.getUserId());
org.springblade.common.model.DistributionReCheckSignVO distributionLoadVO = new org.springblade.common.model.DistributionReCheckSignVO();
@ -1005,6 +1005,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
@Override
@Transactional
public R signforInPC(DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
Date signforTime = new Date();
String method = "DistributionSignforServiceImpl类，signforInPC方法";
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
@ -1058,7 +1059,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
loadscaninvnEntity.setReceivedQuantity(inventoryPackage.get(0).getNum());
loadscaninvnEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
loadscaninvnEntity.setSignforType(LoadScanSigningTypeStatusConstant.wenyuanpiliangqianshou.getValue());
loadscaninvnEntity.setSigningTime(simpleDateFormat.format(new Date()));
loadscaninvnEntity.setSigningTime(DateUtil.formatDateTime(signforTime));
loadscaninvnEntity.setOneQclick(1);
pushList.add(loadscaninvnEntity);
distributionLoadscaninvnService.updateById(loadscaninvnEntity);
@ -1127,7 +1128,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscaninvnEntity.setLoadedNub(1);
distributionLoadscaninvnEntity.setSigningUser(user.getNickName());
distributionLoadscaninvnEntity.setSigningUserId(user.getUserId());
distributionLoadscaninvnEntity.setSigningTime(simpleDateFormat.format(new Date(System.currentTimeMillis() + (6 * 1000))));
distributionLoadscaninvnEntity.setSigningTime(DateUtil.formatDateTime(signforTime));
distributionLoadscaninvnService.save(distributionLoadscaninvnEntity);
pushList.add(distributionLoadscaninvnEntity);
// //更新装车数量
@ -1164,7 +1165,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
warehouseUpdownStockUpAreaClient.downStockUpShelf(jsonObjects);
// 增加PC库存品签收
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVOByStock(deliveryListEntity, pushList, OperatModeConstant.CLERK);
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVOByStock(deliveryListEntity, pushList, OperatModeConstant.CLERK, signforTime);
distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser());
}
@ -1354,6 +1355,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
*/
@Override
public R signforZeroPC(DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
Date signforTime = new Date();
String method = "#############DistributionSignforServiceImpl.signforZeroPC";
if (Func.isEmpty(distrilbutionloadingscanDTO.getZeroPackageIds())) {
log.error(method + "参数异常,zeroPackageIds为空");
@ -1490,7 +1492,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
unLoadscanEntity.setLoadingId(driverPhone);
unLoadscanEntity.setScanType(LoadingStatusConstant.buluzhuangche.getValue());
unLoadscanEntity.setScanTime(simpleDateFormat.format(new Date()));
unLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date(System.currentTimeMillis() + (6 * 1000))));
unLoadscanEntity.setSigningTime(DateUtil.formatDateTime(signforTime));
unLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
unLoadscanEntity.setSigningUserId(user.getUserId());
unLoadscanEntity.setSigningUser(user.getNickName());
@ -1524,7 +1526,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
int i1 = reservationZeroPackageEntity.getQuantity() - loadscanEntity.getLoadedNub();
loadscanEntity.setSigningUser(user.getNickName());
loadscanEntity.setSigningUserId(user.getUserId());
loadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
loadscanEntity.setSigningTime(DateUtil.formatDateTime(signforTime));
loadscanEntity.setIsSignfor(2);
loadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
loadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.wenyuanpiliangqianshou.getValue());
@ -1559,7 +1561,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
// 发送作业节点
// 作业节点推送
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVOByZero(deliveryListEntity, pushList,OperatModeConstant.CLERK);
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVOByZero(deliveryListEntity, pushList,OperatModeConstant.CLERK, signforTime);
distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser());
@ -2885,7 +2887,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
@Transactional(rollbackFor = Exception.class)
public R signfor(DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
Date signforTime = new Date();
String nickName = null;
Long userId = null;
//思路： 在于一个客户下不会出现重复的包条码
@ -2983,7 +2985,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
//存在装车记录，进行修改即可
//进行签收记录数据的维护
loadscanEntity.setSigningTime(singleTime);
loadscanEntity.setSigningTime(DateUtil.formatDateTime(signforTime));
loadscanEntity.setSignforState(2);
loadscanEntity.setOneClick(1);
loadscanEntity.setOneQclick(1);
@ -3056,7 +3058,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscanEntity.setWarehouseName(myCurrentWarehouse.getName());
distributionLoadscanEntity.setOrderPackageCode(distrilbutionloadingscanDTO.getBarcode());
Date signingTime = new Date(System.currentTimeMillis() + (1000 * 60));
distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(signingTime));
distributionLoadscanEntity.setSigningTime(DateUtil.formatDateTime(signforTime));
distributionLoadscanEntity.setReceivedQuantity(collect.get(0).getQuantity());
distributionLoadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
distributionLoadscanEntity.setIsSignfor(2);
@ -3193,7 +3195,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
// 构建新作业节点回传
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity, distributionReservationEntity, pushList, OperatModeConstant.SCAN);
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity, distributionReservationEntity, pushList, OperatModeConstant.SCAN, signforTime);
distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser());
@ -3206,7 +3208,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
private NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> buildDistributionSignforVOByStock(DistributionDeliveryListEntity distributionDeliveryListEntity, List<DistributionLoadscaninvnEntity> pushList, String operatMode) {
private NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> buildDistributionSignforVOByStock(DistributionDeliveryListEntity distributionDeliveryListEntity,
List<DistributionLoadscaninvnEntity> pushList, String operatMode,Date signforTime) {
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = new NodeFanoutMsg();
nodeFanoutMsg.setBizOperation(BizOperationEnums.ADD);
@ -3214,7 +3217,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
nodeFanoutMsg.setWarehouse(distributionDeliveryListEntity.getWarehouseName());
nodeFanoutMsg.setWarehouseId(distributionDeliveryListEntity.getWarehouseId());
nodeFanoutMsg.setOperator(AuthUtil.getNickName());
nodeFanoutMsg.setOperatorTime(distributionDeliveryListEntity.getUpdateTime());
nodeFanoutMsg.setOperatorTime(signforTime);
// DistributionTaskVO taskVO = buildDistributionTaskVO(distributionDeliveryListEntity, AuthUtil.getUserId());
org.springblade.common.model.DistributionSignforVO distributionLoadVO = new org.springblade.common.model.DistributionSignforVO();
@ -3273,7 +3276,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
private NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> buildDistributionSignforVO(DistributionDeliveryListEntity distributionDeliveryListEntity, DistributionReservationEntity distributionReservationEntity, List<DistributionLoadscanEntity> pushList, String operatMode) {
private NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> buildDistributionSignforVO(DistributionDeliveryListEntity distributionDeliveryListEntity, DistributionReservationEntity distributionReservationEntity, List<DistributionLoadscanEntity> pushList, String operatMode, Date signforTime) {
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = new NodeFanoutMsg();
nodeFanoutMsg.setBizOperation(BizOperationEnums.ADD);
@ -3281,7 +3284,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
nodeFanoutMsg.setWarehouse(distributionDeliveryListEntity.getWarehouseName());
nodeFanoutMsg.setWarehouseId(distributionDeliveryListEntity.getWarehouseId());
nodeFanoutMsg.setOperator(AuthUtil.getNickName());
nodeFanoutMsg.setOperatorTime(distributionDeliveryListEntity.getUpdateTime());
nodeFanoutMsg.setOperatorTime(signforTime);
// DistributionTaskVO taskVO = buildDistributionTaskVO(distributionDeliveryListEntity, AuthUtil.getUserId());
org.springblade.common.model.DistributionSignforVO distributionLoadVO = new org.springblade.common.model.DistributionSignforVO();
@ -3412,6 +3415,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
@Transactional(rollbackFor = Exception.class)
public R signforPC(DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
Date signforTime = new Date();
try {
String nickName = null;
Long userId = null;
@ -3519,7 +3523,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
DistributionLoadscanEntity newDistributionLoadscanEntity = new DistributionLoadscanEntity();
newDistributionLoadscanEntity.setId(distributionLoadscanEntity.getId());
//进行签收记录数据的维护
newDistributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
newDistributionLoadscanEntity.setSigningTime(DateUtil.formatDateTime(signforTime));
newDistributionLoadscanEntity.setSignforState(2);
newDistributionLoadscanEntity.setReceivedQuantity(distributionLoadscanEntity.getLoadedNub());
newDistributionLoadscanEntity.setWarehouseId(myCurrentWarehouse.getId());
@ -3581,7 +3585,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscanEntity.setPackageId(parcelListEntity.getId());
distributionLoadscanEntity.setOrderPackageCode(parcelListEntity.getOrderPackageCode());
Date signingTime = new Date(System.currentTimeMillis() + (1000 * 60));
distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(signingTime));
distributionLoadscanEntity.setSigningTime(DateUtil.formatDateTime(signforTime));
distributionLoadscanEntity.setReceivedQuantity(parcelListEntity.getQuantity());
distributionLoadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
distributionLoadscanEntity.setIsSignfor(2);
@ -3666,7 +3670,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
// 推送作业节点
// 作业节点数据推送
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity, distributionReservationEntity, pushDatas, OperatModeConstant.CLERK);
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity, distributionReservationEntity, pushDatas, OperatModeConstant.CLERK, signforTime);
distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser());
@ -3788,6 +3792,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
public R signforcontinue(DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
try {
Date signforTime = new Date();
BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
if (Func.isEmpty(myCurrentWarehouse)) {
return R.fail(403, "未授权!!!");
@ -3896,7 +3901,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscanEntity.setScanTime(simpleDateFormat.format(new Date()));
distributionLoadscanEntity.setPackageId(parcelListEntity.getId());
distributionLoadscanEntity.setOrderPackageCode(distrilbutionloadingscanDTO.getBarcode());
distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
distributionLoadscanEntity.setSigningTime(DateUtil.formatDateTime(signforTime));
distributionLoadscanEntity.setReceivedQuantity(parcelListEntity.getQuantity());
distributionLoadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
distributionLoadscanEntity.setIsSignfor(2);
@ -3993,7 +3998,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscanEntity.setScanTime(simpleDateFormat.format(new Date()));
distributionLoadscanEntity.setPackageId(parcelListEntity.getId());
distributionLoadscanEntity.setOrderPackageCode(distrilbutionloadingscanDTO.getBarcode());
distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
distributionLoadscanEntity.setSigningTime(DateUtil.formatDateTime(signforTime));
distributionLoadscanEntity.setReceivedQuantity(parcelListEntity.getQuantity());
distributionLoadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
distributionLoadscanEntity.setIsSignfor(2);
@ -4107,7 +4112,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionSignforMapper.autoDpdateSignfor(signforEntity.getReservationId());
// 作业节点数据推送
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVO(distributionDeliveryListEntity, reservationEntity, pushList, OperatModeConstant.SCAN);
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVO(distributionDeliveryListEntity, reservationEntity, pushList, OperatModeConstant.SCAN, signforTime);
distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser());
return Resp.scanSuccess("操作成功", s);
@ -4310,6 +4315,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
@Override
@Transactional(rollbackFor = Exception.class)
public R signforIn(DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
Date signforTime = new Date();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// //查询该物品是否有所装车
// List<DistributionLoadscanEntity> distributionLoadscanEntities = distributionLoadscanMapper.selectList(new QueryWrapper<DistributionLoadscanEntity>().lambda()
@ -4366,7 +4372,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
loadscaninvnEntity.setSigningUser(user.getNickName());
loadscaninvnEntity.setReceivedQuantity(inventory.get(0).getNum());
loadscaninvnEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
loadscaninvnEntity.setSigningTime(simpleDateFormat.format(new Date()));
loadscaninvnEntity.setSigningTime(DateUtil.formatDateTime(signforTime));
loadscaninvnEntity.setOneQclick(1);
packageLockIds.add(loadscaninvnEntity.getInventoryPackageId());
distributionLoadscaninvnService.updateById(loadscaninvnEntity);
@ -4429,7 +4435,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscaninvnEntity.setLoadedNub(1);
distributionLoadscaninvnEntity.setSigningUser(user.getNickName());
distributionLoadscaninvnEntity.setSigningUserId(user.getUserId());
distributionLoadscaninvnEntity.setSigningTime(simpleDateFormat.format(new Date()));
distributionLoadscaninvnEntity.setSigningTime(DateUtil.formatDateTime(signforTime));
distributionLoadscaninvnService.save(distributionLoadscaninvnEntity);
pushList.add(distributionLoadscaninvnEntity);
//更新装车数量
@ -4500,7 +4506,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
// 作业节点数据推送
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVOByStock(deliveryListEntity, pushList, OperatModeConstant.SCAN);
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVOByStock(deliveryListEntity, pushList, OperatModeConstant.SCAN, signforTime);
distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser());
@ -6945,6 +6951,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
@Override
@Transactional
public R zeroSignfor(DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
Date signforTime = new Date();
BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
if (Func.isEmpty(myCurrentWarehouse)) {
log.error("###################无仓库信息:{}", myCurrentWarehouse);
@ -7055,7 +7062,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscanEntity.setSigningUser(user.getNickName());
distributionLoadscanEntity.setSigningUserId(user.getUserId());
distributionLoadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
distributionLoadscanEntity.setSigningTime(DateUtil.formatDateTime(signforTime));
distributionLoadscanEntity.setSigningUser(user.getNickName());
loadedNumber += parcelNumberDTO.getSigningNum();
receivedQuantity += parcelNumberDTO.getSigningNum();
@ -7114,7 +7121,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
loadscanEntity.setReceivedQuantity(parcelNumberDTO.getSigningNum());
loadscanEntity.setOneClick(2);
loadscanEntity.setOneQclick(2);
loadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
loadscanEntity.setSigningTime(DateUtil.formatDateTime(signforTime));
distributionLoadscanService.save(loadscanEntity);
pushList.add(loadscanEntity);
loadedNumber += loadscanEntity.getLoadedNub();
@ -7184,7 +7191,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
// 作业节点推送
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVOByZero(deliveryListEntity, pushList, OperatModeConstant.SCAN);
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVOByZero(deliveryListEntity, pushList, OperatModeConstant.SCAN, signforTime);
distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser());
@ -7192,7 +7199,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
return Resp.scanSuccess("签收成功", str);
}
private NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> buildDistributionSignforVOByZero(DistributionDeliveryListEntity distributionDeliveryListEntity, List<DistributionLoadscanEntity> pushList,String operatMode) {
private NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> buildDistributionSignforVOByZero(DistributionDeliveryListEntity distributionDeliveryListEntity, List<DistributionLoadscanEntity> pushList,String operatMode, Date signforTime) {
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = new NodeFanoutMsg();
nodeFanoutMsg.setBizOperation(BizOperationEnums.ADD);
@ -7200,7 +7207,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
nodeFanoutMsg.setWarehouse(distributionDeliveryListEntity.getWarehouseName());
nodeFanoutMsg.setWarehouseId(distributionDeliveryListEntity.getWarehouseId());
nodeFanoutMsg.setOperator(AuthUtil.getNickName());
nodeFanoutMsg.setOperatorTime(distributionDeliveryListEntity.getUpdateTime());
nodeFanoutMsg.setOperatorTime(signforTime);
org.springblade.common.model.DistributionSignforVO distributionLoadVO = new org.springblade.common.model.DistributionSignforVO();
@ -8006,6 +8013,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
@Override
@Transactional
public R newSignfor(DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
Date signforTime = new Date();
String method = "#################################DistributionSignforServiceImpl.newSignfor";
//参数校验
if (Func.isEmpty(distrilbutionloadingscanDTO.getDeliveryId())) {
@ -8291,11 +8299,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscanEntity.setWarehouseName(myCurrentWarehouse.getName());
distributionLoadscanEntity.setReceivedQuantity(parcelNumberDTO.getSigningNum());
distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
distributionLoadscanEntity.setScanTime(now);
distributionLoadscanEntity.setScanTime(DateUtil.formatDateTime(signforTime));
distributionLoadscanEntity.setSigningUser(user.getNickName());
distributionLoadscanEntity.setSigningUserId(user.getUserId());
distributionLoadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
distributionLoadscanEntity.setSigningTime(now);
distributionLoadscanEntity.setSigningTime(DateUtil.formatDateTime(signforTime));
distributionLoadscanEntity.setSigningUser(user.getNickName());
//进行签收数量的统计
outboundQuantity += distributionLoadscanEntity.getLoadedNub();
@ -8361,7 +8369,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
loadscanEntity.setReceivedQuantity(parcelNumberDTO.getSigningNum());
loadscanEntity.setOneClick(2);
loadscanEntity.setOneQclick(2);
loadscanEntity.setSigningTime(now);
loadscanEntity.setSigningTime(DateUtil.formatDateTime(signforTime));
outboundQuantity += loadscanEntity.getLoadedNub();
deliveryQuantity = deliveryQuantity - loadscanEntity.getLoadedNub();
signinQuantity += loadscanEntity.getLoadedNub();
@ -8441,7 +8449,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
loadscaninvnEntity.setSigningUser(user.getNickName());
loadscaninvnEntity.setReceivedQuantity(disStockListDetailEntity.getNum());
loadscaninvnEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
loadscaninvnEntity.setSigningTime(now);
loadscaninvnEntity.setSigningTime(DateUtil.formatDateTime(signforTime));
loadscaninvnEntity.setOneQclick(1);
loadscaninvnEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
packageLockIds.add(loadscaninvnEntity.getInventoryPackageId());
@ -8482,7 +8490,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscaninvnEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
distributionLoadscaninvnEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
distributionLoadscaninvnEntity.setScanUser(user.getNickName());
distributionLoadscaninvnEntity.setScanTime(now);
distributionLoadscaninvnEntity.setScanTime(DateUtil.formatDateTime(signforTime));
distributionLoadscaninvnEntity.setPackageNub(disStockListDetailEntity.getNum());
distributionLoadscaninvnEntity.setScanStatus(LoadingStatusConstant.saomiao.getValue());
distributionLoadscaninvnEntity.setIsInsert(LoadingIsInsertConstant.bulu.getValue());
@ -8498,7 +8506,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscaninvnEntity.setLoadedNub(1);
distributionLoadscaninvnEntity.setSigningUser(user.getNickName());
distributionLoadscaninvnEntity.setSigningUserId(user.getUserId());
distributionLoadscaninvnEntity.setSigningTime(now);
distributionLoadscaninvnEntity.setSigningTime(DateUtil.formatDateTime(signforTime));
distributionLoadscaninvnService.save(distributionLoadscaninvnEntity);
pushInventoryList.add(distributionLoadscaninvnEntity);
//更新装车数量
@ -8546,12 +8554,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
if (!pushInventoryList.isEmpty()) {
// 作业节点数据推送
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVOByStock(deliveryListEntity, pushInventoryList, OperatModeConstant.SCAN);
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVOByStock(deliveryListEntity, pushInventoryList, OperatModeConstant.SCAN, signforTime);
distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser());
}
if (!pushList.isEmpty()) {
// 构建新作业节点回传
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity, reservationEntity, pushList, OperatModeConstant.SCAN);
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity, reservationEntity, pushList, OperatModeConstant.SCAN, signforTime);
distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser());
}
if (!orderCodes.isEmpty()) {

Write Preview
Loading…
Cancel
Save