root/chengHou
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
lyd
2022-11-11 18:52:22 +08:00
parent 6be71f7fcd
commit af0ef390cd
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/dto/MaterialLabelDto.java
View File

@@ -49,6 +49,9 @@ public class MaterialLabelDto implements Serializable {
/** 批次 */ /** 批次 */
private String pcsn; private String pcsn;
// 颜色
private String color;
/** 物料标识 */ /** 物料标识 */
private String material_uuid; private String material_uuid;

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/impl/MaterialLabelServiceImpl.java
View File

@@ -141,7 +141,7 @@ class MaterialLabelServiceImpl implements MaterialLabelService {
//物料标签主表【md_base_materialLabelMst】 //物料标签主表【md_base_materialLabelMst】
WQLObject labelMstTab = WQLObject.getWQLObject("md_base_materialLabelMst"); WQLObject labelMstTab = WQLObject.getWQLObject("md_base_materialLabelMst");
JSONObject labelObj = labelMstTab.query("formula = '" + dto.getFormula() + "' and pcsn = '" + dto.getPcsn() + "'").uniqueResult(0); JSONObject labelObj = labelMstTab.query("formula = '" + dto.getFormula() + "' and pcsn = '" + dto.getPcsn() + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(labelObj) && StrUtil.equals(labelObj.optString("label_uuid"), dto.getLabel_uuid())) if (ObjectUtil.isNotEmpty(labelObj) && !StrUtil.equals(labelObj.optString("label_uuid"), dto.getLabel_uuid()))
throw new BadRequestException("配方为【" + dto.getFormula() + "】,批次为【" + dto.getPcsn() + "】的标签已经存在!"); throw new BadRequestException("配方为【" + dto.getFormula() + "】,批次为【" + dto.getPcsn() + "】的标签已经存在!");