weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
zhou-hongcheng
2026-03-02 09:10:37 +08:00
parent 6b3c73f25a cf0e49ebb0
commit e1dfb71da4
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/po/ContractManagePO.java
+1 -1
View File
@@ -166,7 +166,7 @@ public class ContractManagePO extends BaseVOEntity{
private Integer automaticFlag; private Integer automaticFlag;
@ApiModelProperty("出账日期") @ApiModelProperty("出账日期")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "d", timezone = "GMT+8")
private Date paymentDate; private Date paymentDate;
@ApiModelProperty(name = "主体类型(1-货主，2-客户，3-承运商)") @ApiModelProperty(name = "主体类型(1-货主，2-客户，3-承运商)")
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
+6 -3
View File
@@ -981,7 +981,7 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
List<OutMaterialDetail> outMaterialDetailDbList = outMaterialDetailMapper.selectList(new QueryWrapper<OutMaterialDetail>().lambda() List<OutMaterialDetail> outMaterialDetailDbList = outMaterialDetailMapper.selectList(new QueryWrapper<OutMaterialDetail>().lambda()
.eq(OutMaterialDetail::getOutOrderNumber, stockOutOrderDO.getOutOrderNumber()) .eq(OutMaterialDetail::getOutOrderNumber, stockOutOrderDO.getOutOrderNumber())
.eq(OutMaterialDetail::getLevel, 1) //.eq(OutMaterialDetail::getLevel, 1)
.eq(OutMaterialDetail::getDelFlag, 1)); .eq(OutMaterialDetail::getDelFlag, 1));
Map<Long, OutMaterialDetail> materialDetailMap = outMaterialDetailDbList.stream().collect(Collectors.toMap(OutMaterialDetail::getMaterialDetailId, Function.identity())); Map<Long, OutMaterialDetail> materialDetailMap = outMaterialDetailDbList.stream().collect(Collectors.toMap(OutMaterialDetail::getMaterialDetailId, Function.identity()));
//批量新增或修改物料信息 //批量新增或修改物料信息
@@ -997,7 +997,9 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
outMaterialDetail.setMaterialDetailId(outMaterialDetailDO.getMaterialDetailId()); outMaterialDetail.setMaterialDetailId(outMaterialDetailDO.getMaterialDetailId());
if (1 == type){ if (1 == type){
//复核 //复核
outMaterialDetail.setCheckQuantity(outMaterialDetailDb.getCheckQuantity().add(outMaterialDetailDO.getActualQuantity())); BigDecimal checkQuantity1 = outMaterialDetailDb.getCheckQuantity() != null ? outMaterialDetailDb.getCheckQuantity() : BigDecimal.ZERO;
BigDecimal actualQuantity = outMaterialDetailDO.getActualQuantity() != null ? outMaterialDetailDO.getActualQuantity() : BigDecimal.ZERO;
outMaterialDetail.setCheckQuantity(checkQuantity1.add(actualQuantity));
}else { }else {
//取消复核 //取消复核
outMaterialDetail.setCheckQuantity(outMaterialDetailDb.getCheckQuantity().subtract(outMaterialDetailDO.getActualQuantity())); outMaterialDetail.setCheckQuantity(outMaterialDetailDb.getCheckQuantity().subtract(outMaterialDetailDO.getActualQuantity()));
@@ -1011,7 +1013,8 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
outMaterialDetail.setCheckNetWeight(outMaterialDetailDO.getCheckNetWeight()); outMaterialDetail.setCheckNetWeight(outMaterialDetailDO.getCheckNetWeight());
outMaterialDetailList.add(outMaterialDetail); outMaterialDetailList.add(outMaterialDetail);
checkQuantity = checkQuantity.add(outMaterialDetailDO.getActualQuantity()); BigDecimal actualQuantity = outMaterialDetailDO.getActualQuantity() != null ? outMaterialDetailDO.getActualQuantity() : BigDecimal.ZERO;
checkQuantity = checkQuantity.add(actualQuantity);
} }
//保存物料明细信息 //保存物料明细信息
saveOrUpdateBatch(outMaterialDetailList); saveOrUpdateBatch(outMaterialDetailList);
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
+20
View File
@@ -751,6 +751,26 @@ public class StockOutOrderDomainService {
outMaterialDetailPO.setCheckGrossWeight(pickingMaterialDetailPO.getTotalGrossWeight()); outMaterialDetailPO.setCheckGrossWeight(pickingMaterialDetailPO.getTotalGrossWeight());
outMaterialDetailPO.setWaitCheckQuantity(outMaterialDetailPO.getPickingQuantity()); outMaterialDetailPO.setWaitCheckQuantity(outMaterialDetailPO.getPickingQuantity());
} }
List<OutMaterialDetailPO> children = outMaterialDetailPO.getChildren();
if (!CollectionUtils.isEmpty(children)) {
for (OutMaterialDetailPO outMaterialDetailPOChild : children) {
outMaterialDetailPOChild.setMaterialCode(outMaterialDetailPOChild.getMaterialNo());
outMaterialDetailPOChild.setMaterialName(outMaterialDetailPOChild.getCommodityName());
Long uniqueIdChild = outMaterialDetailPOChild.getUniqueId();
PickingMaterialDetailPO pickingMaterialDetailPO1 = pickingMaterialDetailService.queryTotalsByOutNumberAndBaseId(uniqueIdChild);
if (ObjectUtils.isNotEmpty(pickingMaterialDetailPO1)) {
outMaterialDetailPOChild.setTotalArea(pickingMaterialDetailPO1.getTotalArea());
outMaterialDetailPOChild.setTotalVolume(pickingMaterialDetailPO1.getTotalVolume());
outMaterialDetailPOChild.setTotalNetWeight(pickingMaterialDetailPO1.getTotalNetWeight());
outMaterialDetailPOChild.setTotalGrossWeight(pickingMaterialDetailPO1.getTotalGrossWeight());
outMaterialDetailPOChild.setCheckArea(pickingMaterialDetailPO1.getTotalArea());
outMaterialDetailPOChild.setCheckVolume(pickingMaterialDetailPO1.getTotalVolume());
outMaterialDetailPOChild.setCheckNetWeight(pickingMaterialDetailPO1.getTotalNetWeight());
outMaterialDetailPOChild.setCheckGrossWeight(pickingMaterialDetailPO1.getTotalGrossWeight());
outMaterialDetailPOChild.setWaitCheckQuantity(outMaterialDetailPOChild.getPickingQuantity());
}
}
}
} }
stockOutOrderPO.setMaterialDetailList(outMaterialDetailPOList); stockOutOrderPO.setMaterialDetailList(outMaterialDetailPOList);
BigDecimal weightLimit = BigDecimal.ZERO; BigDecimal weightLimit = BigDecimal.ZERO;