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-18 14:29:57 +08:00
parent 2b29339cbb 87cacef4f9
commit 9ea39acbbb
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
+9 -4
View File
@@ -1060,10 +1060,15 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
outMaterialDetail.setUpdateBy(loginUser.getUserid());
outMaterialDetail.setUpdateByName(loginUser.getUsername());
outMaterialDetail.setUpdateTime(new Date());
outMaterialDetail.setCheckArea(outMaterialDetailDO.getCheckArea());
outMaterialDetail.setCheckVolume(outMaterialDetailDO.getCheckVolume());
outMaterialDetail.setCheckGrossWeight(outMaterialDetailDO.getCheckGrossWeight());
outMaterialDetail.setCheckNetWeight(outMaterialDetailDO.getCheckNetWeight());
// 前端复核时填写的净重毛重体积面积通过 total* 字段传入，check* 优先，为 null 时用 total* 兜底
outMaterialDetail.setCheckNetWeight(outMaterialDetailDO.getCheckNetWeight() != null
? outMaterialDetailDO.getCheckNetWeight() : outMaterialDetailDO.getTotalNetWeight());
outMaterialDetail.setCheckGrossWeight(outMaterialDetailDO.getCheckGrossWeight() != null
? outMaterialDetailDO.getCheckGrossWeight() : outMaterialDetailDO.getTotalGrossWeight());
outMaterialDetail.setCheckVolume(outMaterialDetailDO.getCheckVolume() != null
? outMaterialDetailDO.getCheckVolume() : outMaterialDetailDO.getTotalVolume());
outMaterialDetail.setCheckArea(outMaterialDetailDO.getCheckArea() != null
? outMaterialDetailDO.getCheckArea() : outMaterialDetailDO.getTotalArea());
// 复核时同步净重、毛重、体积、面积到 picking_material_detail，供 getCheckInfo 查询展示（优先 check*，否则 total*）
if (1 == type && outMaterialDetailDb.getUniqueId() != null) {