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

PC物料导入单位修改

Browse Source
This commit is contained in:
秦鸿展
2026-03-31 16:40:37 +08:00
parent 9b08712b31
commit 6e134ad086
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java
+16
View File
@@ -559,6 +559,22 @@ public class MaterialBaseInfoApplicationService {
}
}
}
// 模板未填写物料单位时，默认取包装规格中的 EA 单位
if ((StringUtils.isBlank(row.getUnitCode()) || StringUtils.isBlank(row.getUnitName()))
&& row.getPackId() != null) {
AjaxResult packDetailResult = systemServiceFeign.getInfoByPackIdAndUnitCode(row.getPackId(), "EA");
if ("200".equals(String.valueOf(packDetailResult.get("code"))) && packDetailResult.get("data") != null) {
PackDetailFeignPO pd = JSON.parseObject(JSONObject.toJSONString(packDetailResult.get("data")), PackDetailFeignPO.class);
if (pd != null) {
if (StringUtils.isBlank(row.getUnitCode()) && StringUtils.isNotBlank(pd.getUnitCode())) {
row.setUnitCode(pd.getUnitCode());
}
if (StringUtils.isBlank(row.getUnitName()) && StringUtils.isNotBlank(pd.getName())) {
row.setUnitName(pd.getName());
}
}
}
}
// 兜底：导入模板给了“物料单位/单位”，但包装明细未命中时至少保留单位名称
if (StringUtils.isBlank(row.getUnitName()) && StringUtils.isNotBlank(unitInput)) {
row.setUnitName(unitInput);