diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/ext/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/ext/acs/service/impl/AcsToWmsServiceImpl.java index 0745cafb..c67ede00 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -597,14 +597,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { weightTab.insert(jsonWeight); try { String material = ""; - if ((StrUtil.equals(type, "1.1")) || (StrUtil.equals(type, "1.2")) || (StrUtil.equals(type, "2.1")) || (StrUtil.equals(type, "2.2"))) { + if ((StrUtil.equals(type, "1.1")) || (StrUtil.equals(type, "1.2")) || (StrUtil.equals(type, "1.3")) || (StrUtil.equals(type, "1.4")) || (StrUtil.equals(type, "2.1")) || (StrUtil.equals(type, "2.2"))) { String formuladtl_id = jsonObject.getString("formuladtl_id"); if (ObjectUtil.isEmpty(formuladtl_id)) throw new BadRequestException("明细标识不能为空"); JSONObject jsonObject1 = dtlTab.query("formuladtl_id = '" + formuladtl_id + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonObject1)) throw new BadRequestException("配方明细不存在"); if (StrUtil.equals(jsonObject1.getString("material_type"), "02")) { - if ((StrUtil.equals(type, "1.1")) || (StrUtil.equals(type, "1.2"))) { + if ((StrUtil.equals(type, "1.1")) || (StrUtil.equals(type, "1.2")) || (StrUtil.equals(type, "1.3")) || (StrUtil.equals(type, "1.4"))) { if (ObjectUtil.isEmpty(barrel_no)) throw new BadRequestException("桶号不能为空"); JSONObject jsonObject2 = dtlJobTab.query("formuladtl_id ='" + formuladtl_id + "' and bucketunique ='" + barrel_no + "'and status = '10'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonObject2)) throw new BadRequestException("配方明细作业为空");