diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/dto/MaterialLabelDto.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/dto/MaterialLabelDto.java index e376b21..a184489 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/dto/MaterialLabelDto.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/dto/MaterialLabelDto.java @@ -49,6 +49,9 @@ public class MaterialLabelDto implements Serializable { /** 批次 */ private String pcsn; + // 颜色 + private String color; + /** 物料标识 */ private String material_uuid; diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/impl/MaterialLabelServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/impl/MaterialLabelServiceImpl.java index 613052d..41b2e56 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/impl/MaterialLabelServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/impl/MaterialLabelServiceImpl.java @@ -141,7 +141,7 @@ class MaterialLabelServiceImpl implements MaterialLabelService { //物料标签主表【md_base_materialLabelMst】 WQLObject labelMstTab = WQLObject.getWQLObject("md_base_materialLabelMst"); 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() + "】的标签已经存在!");