diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java index 8cd2453..6714176 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java @@ -261,5 +261,13 @@ public class PdmBiSubpackagerelationController { return null; },"下载任务时间",response); } + + + @PostMapping("/checkCode") + @Log("三码合一校验") + @SaIgnore + public ResponseEntity checkCode(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdmBiSubpackagerelationService.checkCode(whereJson), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java index 6807792..4867f55 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java @@ -162,6 +162,10 @@ public interface IpdmBiSubpackagerelationService extends IService getSubInfoByBoxNosToObject(List boxs); void packagerelation(PdmBiSubpackagerelationQuery pdmBiSubpackagerelationQuery); + + + JSONObject checkCode(JSONObject jo); + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java index 4b98cde..734e87c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java @@ -372,8 +372,6 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl (JSONObject) JSON.toJSON(sub)); } + + + @Override + public JSONObject checkCode(JSONObject jo) { + //内标 + String nb_code = jo.getString("nb_code"); + //管标 + String gb_code = jo.getString("gb_code"); + //木箱码 + String box_code = jo.getString("box_code"); + //客户标签码 + String customer_code = jo.getString("customer_code"); + + if (!StrUtil.equals(nb_code, gb_code)) { + throw new BadRequestException("内标【" + nb_code + "】和管标【" + gb_code + "】子卷号不一致！"); + } + + if (!StrUtil.equals(box_code, customer_code)) { + throw new BadRequestException("木箱码【" + box_code + "】和客户标签码【" + customer_code + "】箱号不一致！"); + } + + PdmBiSubpackagerelation subDto = this.getOne(new LambdaQueryWrapper().eq(PdmBiSubpackagerelation::getContainer_name, nb_code)); + if (ObjectUtil.isEmpty(subDto)) { + throw new BadRequestException("子卷号【" + nb_code + "】在LMS系统上为查询到包装关系！"); + } + if (StrUtil.isEmpty(subDto.getPackage_box_sn())) { + throw new BadRequestException("子卷号【" + nb_code + "】在LMS系统上包装关系的木箱号为空！"); + } + if (!StrUtil.equals(box_code, subDto.getPackage_box_sn())) { + throw new BadRequestException("子卷号绑定的木箱码【" + subDto.getPackage_box_sn() + "】和木箱码【" + box_code + "】箱号不一致！"); + } + JSONObject result = new JSONObject(); + result.put("message", "校验通过！"); + return result; + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoBoxExcepTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoBoxExcepTask.java index b90de07..1d48806 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoBoxExcepTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoBoxExcepTask.java @@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.AcsTaskDto; @@ -123,7 +124,7 @@ public class TwoBoxExcepTask extends AbstractAcsTask { } if (StrUtil.isBlank(form.getString("start_device_code"))) { - throw new BadRequestException("起点不能为空!"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } if (StrUtil.isBlank(form.getString("next_device_code"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExcepionalMoveTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExcepionalMoveTask.java index 5569b30..bd10a4a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExcepionalMoveTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExcepionalMoveTask.java @@ -14,6 +14,7 @@ import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.b_lms.storage_manage.st.dao.StIvtStructattr; import org.nl.b_lms.storage_manage.st.dao.mapper.StIvtStructattrMapper; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.AcsTaskDto; @@ -144,7 +145,7 @@ public class TwoExcepionalMoveTask extends AbstractAcsTask { } if (StrUtil.isBlank(form.getString("start_device_code"))) { - throw new BadRequestException("起点不能为空!"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } if (StrUtil.isBlank(form.getString("next_device_code"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java index 65ea580..342b27a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.AcsTaskDto; @@ -173,7 +174,7 @@ public class TwoInBoxTask extends AbstractAcsTask { } if (StrUtil.isBlank(form.getString("start_device_code"))) { - throw new BadRequestException("起点不能为空!"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } if (StrUtil.isBlank(form.getString("next_device_code"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java index c64c0d3..0286dba 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java @@ -15,6 +15,7 @@ import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.AcsTaskDto; @@ -136,7 +137,7 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { } if (StrUtil.isBlank(form.getString("start_device_code"))) { - throw new BadRequestException("起点不能为空!"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } if (StrUtil.isBlank(form.getString("next_device_code"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpExcepTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpExcepTask.java index d605321..61c0b24 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpExcepTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpExcepTask.java @@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.AcsTaskDto; @@ -123,7 +124,7 @@ public class TwoInEmpExcepTask extends AbstractAcsTask { } if (StrUtil.isBlank(form.getString("start_device_code"))) { - throw new BadRequestException("起点不能为空!"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } if (StrUtil.isBlank(form.getString("next_device_code"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java index ef2e7f9..ea196f6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java @@ -11,6 +11,7 @@ import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinvdis; import org.nl.b_lms.storage_manage.ios.service.iostorInv.impl.StIvtIostorinvdisServiceImpl; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; @@ -150,7 +151,7 @@ public class TwoInEmpTask extends AbstractAcsTask { } if (StrUtil.isBlank(form.getString("start_device_code"))) { - throw new BadRequestException("起点不能为空!"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } if (StrUtil.isBlank(form.getString("next_device_code"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java index a745cb7..288ef84 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java @@ -10,6 +10,7 @@ import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinvdis; import org.nl.b_lms.storage_manage.ios.service.iostorInv.impl.StIvtIostorinvdisServiceImpl; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; @@ -147,7 +148,7 @@ public class TwoInTask extends AbstractAcsTask { } if (StrUtil.isBlank(form.getString("start_device_code"))) { - throw new BadRequestException("起点不能为空!"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } if (StrUtil.isBlank(form.getString("next_device_code"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java index e328b87..37909df 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java @@ -16,6 +16,7 @@ import org.nl.b_lms.storage_manage.database.service.dao.MdpbBoxtype; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.mapper.StIvtIostorinvOutMapper; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; @@ -112,7 +113,7 @@ public class TwoLashTask extends AbstractAcsTask { if (ObjectUtil.isEmpty(boxTypeDao.getLash_num_tow())) { throw new BadRequestException("第二次捆扎数不能为空!"); } - + interaction_json.put("bindingTimes", boxTypeDao.getLash_num_tow()); // 是否二次捆扎: 如果是返检或者反切的则不需要捆扎（找最近的木箱出库单据） if (ObjectUtil.isEmpty(boxTypeDao.getNeed_lash_two())) { @@ -259,7 +260,7 @@ public class TwoLashTask extends AbstractAcsTask { } if (StrUtil.isBlank(form.getString("start_device_code"))) { - throw new BadRequestException("起点不能为空!"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } if (StrUtil.isBlank(form.getString("next_device_code"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java index 7977463..cde024e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.AcsTaskDto; @@ -163,7 +164,7 @@ public class TwoMoveBoxTask extends AbstractAcsTask { } if (StrUtil.isBlank(form.getString("start_device_code"))) { - throw new BadRequestException("起点不能为空!"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } if (StrUtil.isBlank(form.getString("next_device_code"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxExcepTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxExcepTask.java index 5e6fbea..eb34dab 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxExcepTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxExcepTask.java @@ -15,6 +15,7 @@ import org.nl.b_lms.storage_manage.md.dao.mapper.MdPdStoragevehicleextMapper; import org.nl.b_lms.storage_manage.st.dao.StIvtStructattr; import org.nl.b_lms.storage_manage.st.dao.mapper.StIvtStructattrMapper; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.AcsTaskDto; @@ -164,7 +165,7 @@ public class TwoOutBoxExcepTask extends AbstractAcsTask { } if (StrUtil.isBlank(form.getString("start_device_code"))) { - throw new BadRequestException("起点不能为空!"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } if (StrUtil.isBlank(form.getString("next_device_code"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java index 4227ede..bd9f4ff 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java @@ -23,6 +23,7 @@ import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.OutBoxMana import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.utils.RedissonUtils; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.AcsTaskDto; @@ -215,7 +216,7 @@ public class TwoOutBoxTask extends AbstractAcsTask { } if (StrUtil.isBlank(form.getString("start_device_code"))) { - throw new BadRequestException("起点不能为空!"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } if (StrUtil.isBlank(form.getString("next_device_code"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java index 5fa9e10..341d681 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java @@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.AcsTaskDto; @@ -140,7 +141,7 @@ public class TwoOutEmpTask extends AbstractAcsTask { } if (StrUtil.isBlank(form.getString("start_device_code"))) { - throw new BadRequestException("起点不能为空!"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } if (StrUtil.isBlank(form.getString("next_device_code"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java index 1370ee2..362e976 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.pda.mps.eum.RegionTypeEnum; @@ -170,7 +171,7 @@ public class TwoOutExceptionalTask extends AbstractAcsTask { } if (StrUtil.isBlank(form.getString("start_device_code"))) { - throw new BadRequestException("起点不能为空!"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } if (StrUtil.isBlank(form.getString("next_device_code"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/BoxSSXTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/BoxSSXTask.java index dde7838..d3afe31 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/BoxSSXTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/BoxSSXTask.java @@ -23,6 +23,7 @@ import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.b_lms.storage_manage.md.dao.MdPdStorageVehicleInfo; import org.nl.b_lms.storage_manage.md.dao.mapper.MdStorageVehicleInfoMapper; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.StringUtils; import org.nl.modules.wql.core.bean.WQLObject; @@ -207,7 +208,7 @@ public class BoxSSXTask extends AbstractAcsTask { if (StrUtil.isBlank(form.getString("start_device_code"))) { - throw new BadRequestException("起点不能为空!"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } if (StrUtil.isBlank(form.getString("next_device_code"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/InBoxTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/InBoxTrussTask.java index aa9dd2d..66f205e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/InBoxTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/InBoxTrussTask.java @@ -15,6 +15,7 @@ import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.AcsTaskDto; @@ -167,7 +168,7 @@ public class InBoxTrussTask extends AbstractAcsTask { } if (StrUtil.isBlank(form.getString("start_device_code"))) { - throw new BadRequestException("起点不能为空!"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } if (StrUtil.isBlank(form.getString("next_device_code"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/MxInTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/MxInTask.java index 175f967..9147be6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/MxInTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/MxInTask.java @@ -22,6 +22,7 @@ import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; @@ -145,7 +146,7 @@ public class MxInTask extends AbstractAcsTask { String vehicleCode = form.getString("vehicle_code"); String pointCode1 = form.getString("point_code1"); if (StrUtil.isBlank(pointCode1)) { - throw new BadRequestException("起点不能为空"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } String pointCode2 = form.getString("point_code2"); if (StrUtil.isBlank(pointCode2)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/MxMoveTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/MxMoveTask.java index d996c57..f20d928 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/MxMoveTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/MxMoveTask.java @@ -24,6 +24,7 @@ import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; @@ -170,7 +171,7 @@ public class MxMoveTask extends AbstractAcsTask { String vehicleCode = form.getString("vehicle_code"); String pointCode1 = form.getString("point_code1"); if (StrUtil.isBlank(pointCode1)) { - throw new BadRequestException("起点不能为空"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } String pointCode2 = form.getString("point_code2"); if (StrUtil.isBlank(pointCode2)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/MxOutTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/MxOutTask.java index bf623aa..d9497a0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/MxOutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/boxstack/MxOutTask.java @@ -28,6 +28,7 @@ import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; @@ -224,7 +225,7 @@ public class MxOutTask extends AbstractAcsTask { // } String pointCode1 = form.getString("point_code1"); if (StrUtil.isBlank(pointCode1)) { - throw new BadRequestException("起点不能为空"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } String pointCode3 = form.getString("point_code3"); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java index 0d8c1f6..0186246 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java @@ -22,6 +22,7 @@ import org.nl.b_lms.sch.tasks.first_floor_area.auto.TaskQueueManager; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; @@ -174,7 +175,7 @@ public class DjqTask extends AbstractAcsTask { // } String pointCode1 = form.getString("point_code1"); if (StrUtil.isBlank(pointCode1)) { - throw new BadRequestException("起点不能为空"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } String pointCode2 = form.getString("point_code2"); if (StrUtil.isBlank(pointCode2)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java index dfc5bbd..d2b235e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java @@ -21,6 +21,7 @@ import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; @@ -137,7 +138,7 @@ public class DjqToKzjhcwTask extends AbstractAcsTask { // } String pointCode1 = form.getString("point_code1"); if (StrUtil.isBlank(pointCode1)) { - throw new BadRequestException("起点不能为空"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } String pointCode2 = form.getString("point_code2"); if (StrUtil.isBlank(pointCode2)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java index 9a90a77..b03d5e7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java @@ -18,6 +18,7 @@ import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; @@ -132,7 +133,7 @@ public class GzqTask extends AbstractAcsTask { } String pointCode1 = form.getString("point_code1"); if (StrUtil.isBlank(pointCode1)) { - throw new BadRequestException("起点不能为空"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } String pointCode2 = form.getString("point_code2"); if (StrUtil.isBlank(pointCode2)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java index eadee8b..d1e46fe 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java @@ -18,6 +18,7 @@ import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; @@ -131,7 +132,7 @@ public class SendDjqKzjTask extends AbstractAcsTask { // } String pointCode1 = form.getString("point_code1"); if (StrUtil.isBlank(pointCode1)) { - throw new BadRequestException("起点不能为空"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } String pointCode2 = form.getString("point_code2"); if (StrUtil.isBlank(pointCode2)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java index 52b6d9c..b3167d0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java @@ -26,6 +26,7 @@ import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapp import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.system.service.param.ISysParamService; import org.nl.wms.sch.AcsTaskDto; @@ -164,7 +165,7 @@ public class ZxqTask extends AbstractAcsTask { } String pointCode1 = form.getString("point_code1"); if (StrUtil.isBlank(pointCode1)) { - throw new BadRequestException("起点不能为空"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } String pointCode2 = form.getString("point_code2"); // if (StrUtil.isBlank(pointCode2)) { @@ -215,7 +216,7 @@ public class ZxqTask extends AbstractAcsTask { } String pointCode1 = form.getString("point_code1"); if (StrUtil.isBlank(pointCode1)) { - throw new BadRequestException("起点不能为空"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } String pointCode2 = form.getString("point_code2"); // if (StrUtil.isBlank(pointCode2)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java index 77ab22d..0cb6b37 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java @@ -58,6 +58,7 @@ import org.nl.b_lms.storage_manage.st.service.StIvtStructivtService; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; @@ -1077,7 +1078,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl) whereJson.get("tableData")).size())); mstDao.setRemark(whereJson.get("remark").toString()); - mstDao.setTotal_qty(BigDecimal.valueOf(Double.parseDouble(whereJson.get("total_qty").toString()))); + if (ObjectUtil.isNotEmpty(whereJson.get("total_qty"))) { + mstDao.setTotal_qty(BigDecimal.valueOf(Double.parseDouble(whereJson.get("total_qty").toString()))); + } mstDao.setUpdate_optid(SecurityUtils.getCurrentUserId()); mstDao.setUpdate_optname(SecurityUtils.getCurrentNickName()); mstDao.setUpdate_time(DateUtil.now()); diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/dict/dao/Dict.java b/lms/nladmin-system/src/main/java/org/nl/system/service/dict/dao/Dict.java index fe1b1e7..24d1d04 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/dict/dao/Dict.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/dict/dao/Dict.java @@ -104,4 +104,19 @@ public class Dict implements Serializable { */ private String update_time; + /** + * 中文字典标签 + */ + private String zh_label; + + /** + * 英文字典标签 + */ + private String en_label; + + /** + * 印尼字典标签 + */ + private String in_label; + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java index 78e2e3b..720fec4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java @@ -21,6 +21,7 @@ import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationServi import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService; import org.nl.common.enums.SpecEnum; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; @@ -92,7 +93,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { } catch (Exception e) { - throw new BadRequestException("MES提示错误：" + e.getMessage()); + throw new BadRequestException(LangBehavior.language("system.mesErrorTitle") + e.getMessage()); } return result; } @@ -150,7 +151,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { throw new BadRequestException(result.getString("RTMSG")); } } catch (Exception e) { - throw new BadRequestException("MES提示错误：" + e.getMessage()); + throw new BadRequestException(LangBehavior.language("system.mesErrorTitle") + e.getMessage()); } return result; } @@ -214,7 +215,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { throw new BadRequestException(result.getString("RTMSG")); } } catch (Exception e) { - throw new BadRequestException("MES提示错误：" + e.getMessage()); + throw new BadRequestException(LangBehavior.language("system.mesErrorTitle") + e.getMessage()); } return result; } @@ -258,7 +259,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { } catch (Exception e) { - log.info("MES提示错误：" + e.getMessage()); + log.info(LangBehavior.language("system.mesErrorTitle") + e.getMessage()); } return result; } @@ -312,7 +313,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { } catch (Exception e) { - log.info("MES提示错误：" + e.getMessage()); + log.info(LangBehavior.language("system.mesErrorTitle") + e.getMessage()); } return result; } @@ -372,7 +373,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { } catch (Exception e) { - throw new BadRequestException("MES提示错误：" + e.getMessage()); + throw new BadRequestException(LangBehavior.language("system.mesErrorTitle") + e.getMessage()); } return result; } @@ -423,7 +424,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { } catch (Exception e) { - log.info("MES提示错误：" + e.getMessage()); + log.info(LangBehavior.language("system.mesErrorTitle") + e.getMessage()); } return result; } @@ -480,7 +481,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { } catch (Exception e) { - throw new BadRequestException("MES提示错误：" + e.getMessage()); + throw new BadRequestException(LangBehavior.language("system.mesErrorTitle") + e.getMessage()); } return result; } @@ -523,7 +524,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { } catch (Exception e) { - throw new BadRequestException("MES提示错误：" + e.getMessage()); + throw new BadRequestException(LangBehavior.language("system.mesErrorTitle") + e.getMessage()); } return result; } @@ -571,7 +572,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { } catch (Exception e) { - throw new BadRequestException("MES提示错误：" + e.getMessage()); + throw new BadRequestException(LangBehavior.language("system.mesErrorTitle") + e.getMessage()); } return result; } @@ -619,7 +620,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { } catch (Exception e) { - throw new BadRequestException("MES提示错误：" + e.getMessage()); + throw new BadRequestException(LangBehavior.language("system.mesErrorTitle") + e.getMessage()); } return result; } @@ -735,7 +736,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { } catch (Exception e) { - throw new BadRequestException("MES提示错误：" + e.getMessage()); + throw new BadRequestException(LangBehavior.language("system.mesErrorTitle") + e.getMessage()); } return result; } @@ -863,7 +864,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { } catch (Exception e) { - throw new BadRequestException("MES提示错误：" + e.getMessage()); + throw new BadRequestException(LangBehavior.language("system.mesErrorTitle") + e.getMessage()); } return result; } @@ -908,7 +909,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { } catch (Exception e) { - throw new BadRequestException("MES提示错误：" + e.getMessage()); + throw new BadRequestException(LangBehavior.language("system.mesErrorTitle") + e.getMessage()); } return result; } @@ -984,7 +985,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { PdmProductSpecServiceImpl.doRecord(SpecEnum.BZ_MES,param,Boolean.TRUE,null,list); } catch (Exception e) { PdmProductSpecServiceImpl.doRecord(SpecEnum.BZ_MES,param,Boolean.FALSE,e.getMessage(),list); - throw new BadRequestException("MES提示错误：" + e.getMessage()); + throw new BadRequestException(LangBehavior.language("system.mesErrorTitle") + e.getMessage()); } return result; } @@ -1054,7 +1055,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { String RTYPE = result.getString("RTYPE"); if ("E".equals(RTYPE)) { - throw new BadRequestException("MES提示错误：" +result.getString("RTMSG")); + throw new BadRequestException(LangBehavior.language("system.mesErrorTitle") +result.getString("RTMSG")); } } catch (Exception e) { PdmProductSpecServiceImpl.doRecord(SpecEnum.YX_MES,param,Boolean.FALSE,e.getMessage(),containerName); @@ -1219,7 +1220,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { } catch (Exception e) { - throw new BadRequestException("MES提示错误：" + e.getMessage()); + throw new BadRequestException(LangBehavior.language("system.mesErrorTitle") + e.getMessage()); } return result; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java index d13e6b5..70daeb8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java @@ -22,6 +22,7 @@ import org.nl.b_lms.sch.task.dao.mapper.SchBaseTaskMapper; import org.nl.b_lms.storage_manage.md.dao.MdMeMaterialBase; import org.nl.b_lms.storage_manage.md.dao.mapper.MdMeMaterialBaseMapper; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.RedisUtils; import org.nl.common.utils.CodeUtil; @@ -500,7 +501,7 @@ public class BakingServiceImpl implements BakingService { throw new BadRequestException("时间不能为空"); } if (ObjectUtil.isEmpty(point_code1)) { - throw new BadRequestException("起点不能为空"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } if (ObjectUtil.isEmpty(point_code3)) { throw new BadRequestException("终点不能为空"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java index f699842..fcbf379 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.common.utils.CodeUtil; import org.nl.modules.wql.core.bean.WQLObject; @@ -73,7 +74,7 @@ public class HandleBakingServiceImpl implements HandleBakingService { throw new BadRequestException("母卷号不能为空"); } if (ObjectUtil.isEmpty(point_code1)) { - throw new BadRequestException("起点不能为空！"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } if (ObjectUtil.isEmpty(next_point_code)) { throw new BadRequestException("终点不能为空"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java index 87c9cd2..200fcda 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; @@ -125,7 +126,7 @@ public class InServiceImpl implements InService { public JSONObject conveyConfirm(JSONObject whereJson) { String point_code = whereJson.getString("point_code"); if (StrUtil.isEmpty(point_code)) { - throw new BadRequestException("起点不能为空！"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } JSONObject task1 = WQLObject.getWQLObject("SCH_BASE_Task").query("(point_code2 = '" + point_code + "' OR point_code1 = '" + point_code + "' ) AND task_status < '07' AND is_delete = '0'").uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java index 37ffd68..7482aa6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; @@ -275,7 +276,7 @@ public class OutServiceImpl implements OutService { public JSONObject conveyConfirm(JSONObject whereJson) { String point_code = whereJson.getString("point_code"); if (StrUtil.isEmpty(point_code)) { - throw new BadRequestException("起点不能为空！"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } JSONObject task1 = WQLObject.getWQLObject("SCH_BASE_Task").query("(point_code2 = '" + point_code + "' OR point_code1 = '" + point_code + "' ) AND task_status < '07' AND is_delete = '0'").uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PointStatusServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PointStatusServiceImpl.java index 6d2a028..48b66cd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PointStatusServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PointStatusServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.ext.mes.service.LmsToMesService; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java index e19e330..0790ca5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; @@ -298,7 +299,7 @@ public class ShippingServiceImpl implements ShippingService { String point_code = whereJson.getString("point_code"); String vehicle_code = whereJson.getString("vehicle_code"); if (StrUtil.isEmpty(point_code)) { - throw new BadRequestException("起点不能为空！"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } if (StrUtil.isEmpty(vehicle_code)) { throw new BadRequestException("载具码不能为空！"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java index b91bc38..bfedfb8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.AcsTaskDto; @@ -163,7 +164,7 @@ public class EmptyVehicleTask extends AbstractAcsTask { } String point_code1 = form.getString("point_code1"); if (StrUtil.isBlank(point_code1)) { - throw new BadRequestException("起点不能为空"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } String point_code2 = form.getString("point_code2"); if (StrUtil.isBlank(point_code2)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTrussTask.java index 4b999d4..8d74194 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTrussTask.java @@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; @@ -208,7 +209,7 @@ public class PaperTrussTask extends AbstractAcsTask { } String point_code1 = form.getString("point_code1"); if (StrUtil.isBlank(point_code1)) { - throw new BadRequestException("起点不能为空"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } String point_code2 = form.getString("point_code2"); if (StrUtil.isBlank(point_code2)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java index 2f71b56..37677c5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java @@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; @@ -201,7 +202,7 @@ public class PaperTubeTask extends AbstractAcsTask { } String point_code1 = form.getString("point_code1"); if (StrUtil.isBlank(point_code1)) { - throw new BadRequestException("起点不能为空"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } String point_code2 = form.getString("point_code2"); if (StrUtil.isBlank(point_code2)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java index a01359c..747cb44 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java @@ -31,6 +31,7 @@ import org.nl.b_lms.storage_manage.st.service.StIvtStructivtService; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; @@ -153,9 +154,9 @@ public class InchargeServiceImpl implements InchargeService { String start_point_code = dto.getStart_point_code(); String next_point_code = dto.getNext_point_code(); - // 判断起点是否为空！ 入库起点不能为空 + // 判断起点是否为空！ 入库起点不能为空! if (ObjectUtil.isEmpty(start_point_code)) { - throw new BadRequestException("起点不能为空"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } // 根据点位编码找到对应的所属区域 Long start_region_id = schBasePointService.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); @@ -193,9 +194,9 @@ public class InchargeServiceImpl implements InchargeService { String start_point_code = dto.getStart_point_code(); String next_point_code = dto.getNext_point_code(); - // 判断起点是否为空！ 入库起点不能为空 + // 判断起点是否为空！ 入库起点不能为空! if (ObjectUtil.isEmpty(start_point_code)) { - throw new BadRequestException("起点不能为空"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } // 根据点位编码找到对应的所属区域 Long start_region_id = schBasePointService.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java index 44a7390..54e9fe6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java @@ -20,6 +20,7 @@ import org.nl.b_lms.storage_manage.st.service.StIvtStructattrService; import org.nl.b_lms.storage_manage.st.service.StIvtStructivtService; import org.nl.b_lms.storage_manage.st.service.StIvtStructivtflowService; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; @@ -54,7 +55,7 @@ public class StorPublicServiceImpl implements StorPublicService { void createStor(JSONObject from) { JSONObject jo = structivtService.getStorageInfoByStrId(from.getString("struct_id")); if (jo == null) { - throw new BadRequestException("仓位不存在或者未启用：" + from.getString("struct_id")); + throw new BadRequestException(LangBehavior.language("system.locationNotExistOrInactive") + from.getString("struct_id")); } // 查询物料信息 MdMeMaterialBase jo_WMSMaterial = materialbaseService.getOne(new LambdaUpdateWrapper() @@ -62,7 +63,7 @@ public class StorPublicServiceImpl implements StorPublicService { .eq(MdMeMaterialBase::getIs_used, "1") .eq(MdMeMaterialBase::getIs_delete, "0")); if (ObjectUtil.isEmpty(jo_WMSMaterial)) { - throw new BadRequestException("物料不存在或者未启用：" + from.getString("material_id")); + throw new BadRequestException(LangBehavior.language("system.materialNotExistOrInactive") + from.getString("material_id")); } from.put("stockrecord_id", IdUtil.getSnowflake(1, 1).nextId() + ""); from.put("struct_code", jo.getString("struct_code")); @@ -177,31 +178,31 @@ public class StorPublicServiceImpl implements StorPublicService { String quality_scode_In; double change_qty; if (ObjectUtil.isEmpty(from)) { - throw new BadRequestException("输入from异常，请检查"); + throw new BadRequestException(LangBehavior.language("system.inputFromException")); } if (StrUtil.isBlank(change_type_scode)) { - throw new BadRequestException("变动类型不能为空"); + throw new BadRequestException(LangBehavior.language("system.changeTypeIsNull")); } from.put("change_type_scode", change_type_scode); struct_id_In = from.getString("struct_id"); if (StrUtil.isBlank(struct_id_In)) { - throw new BadRequestException("货位不能为空"); + throw new BadRequestException(LangBehavior.language("system.storageLocationIsNull")); } material_id_In = from.getString("material_id"); if (StrUtil.isBlank(material_id_In)) { - throw new BadRequestException("物料不能为空"); + throw new BadRequestException(LangBehavior.language("system.materialIsNull")); } pcsn_In = from.getString("pcsn"); if (StrUtil.isBlank(pcsn_In)) { - throw new BadRequestException("物料批次不能为空"); + throw new BadRequestException(LangBehavior.language("system.materialBatchIsNull")); } quality_scode_In = from.getString("quality_scode"); if (StrUtil.isBlank(quality_scode_In)) { - throw new BadRequestException("品质类型不能为空"); + throw new BadRequestException(LangBehavior.language("system.qualityTypeIsNull")); } change_qty = from.getDoubleValue("change_qty"); if (change_qty <= 0) { - throw new BadRequestException("变动数异常，请检查"); + throw new BadRequestException(LangBehavior.language("system.changeNumException")); } // 查询条件 LambdaQueryWrapper sql_where = new LambdaQueryWrapper<>(); @@ -229,18 +230,18 @@ public class StorPublicServiceImpl implements StorPublicService { double ivt_qty = jo_in.getDoubleValue("ivt_qty"); double canuse_qty = NumberUtil.sub(jo_in.getDoubleValue("canuse_qty"), change_qty); if (canuse_qty < 0) { - throw new BadRequestException("可用数不允许为负数！"); + throw new BadRequestException(LangBehavior.language("system.availableNumNotNegative1")); } jo_in.put("canuse_qty", canuse_qty); jo_in.put("frozen_qty", jo_in.getDoubleValue("frozen_qty") + change_qty); double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); if (Double.compare(ivt_num_now, ivt_qty) != 0) { - throw new BadRequestException("输入数据异常，请检查"); + throw new BadRequestException(LangBehavior.language("system.inputDataException")); } structivtService.updateById(jo_in.toJavaObject(StIvtStructivt.class)); } else { - throw new BadRequestException(pcsn_In + "子卷仓位库存异常，请检查"); + throw new BadRequestException(pcsn_In + LangBehavior.language("system.subRollLocationStockException")); } break; case "12": //12减冻结、加可用：出库分配取消、移库移出取消 @@ -251,14 +252,14 @@ public class StorPublicServiceImpl implements StorPublicService { double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); if (Double.compare(ivt_num_now, ivt_qty) != 0) { - throw new BadRequestException("输入数据异常，请检查"); + throw new BadRequestException(LangBehavior.language("system.inputDataException")); } if (jo_in.getDoubleValue("frozen_qty") < 0) { - throw new BadRequestException("库存冻结数异常，请联系管理员分析处理单据！"); + throw new BadRequestException(LangBehavior.language("system.stockFrozenNumException")); } structivtService.updateById(jo_in.toJavaObject(StIvtStructivt.class)); } else { - throw new BadRequestException(pcsn_In + "子卷仓位库存异常，请检查"); + throw new BadRequestException(pcsn_In + LangBehavior.language("system.subRollLocationStockException")); } break; case "21": //21减冻结、减库存：出库确认、移库移出确认 @@ -269,17 +270,17 @@ public class StorPublicServiceImpl implements StorPublicService { double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); if (Double.compare(ivt_num_now, ivt_qty) != 0) { - throw new BadRequestException("输入数据异常，请检查"); + throw new BadRequestException(LangBehavior.language("system.inputDataException")); } if (jo_in.getDoubleValue("ivt_qty") < 0) { - throw new BadRequestException("库存数不允许为负数！"); + throw new BadRequestException(LangBehavior.language("system.stockNumNotNegative")); } if (jo_in.getDoubleValue("frozen_qty") < 0) { - throw new BadRequestException("冻结数不允许为负数！"); + throw new BadRequestException(LangBehavior.language("system.frozenNumNotNegative")); } structivtService.updateById(jo_in.toJavaObject(StIvtStructivt.class)); } else { - throw new BadRequestException(pcsn_In + "子卷仓位库存异常，请检查"); + throw new BadRequestException(pcsn_In + LangBehavior.language("system.subRollLocationStockException")); } break; case "22": //22加冻结、加库存：出库确认取消、移库移出确认取消 @@ -290,7 +291,7 @@ public class StorPublicServiceImpl implements StorPublicService { double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); if (Double.compare(ivt_num_now, ivt_qty) != 0) { - throw new BadRequestException("输入数据异常，请检查"); + throw new BadRequestException(LangBehavior.language("system.inputDataException")); } structivtService.updateById(jo_in.toJavaObject(StIvtStructivt.class)); } else { @@ -309,10 +310,10 @@ public class StorPublicServiceImpl implements StorPublicService { double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); if (Double.compare(ivt_num_now, ivt_qty) != 0) { - throw new BadRequestException("输入数据异常，请检查"); + throw new BadRequestException(LangBehavior.language("system.inputDataException")); } if (jo_in.getDoubleValue("canuse_qty") < 0) { - throw new BadRequestException("可用数不允许为负数！"); + throw new BadRequestException(LangBehavior.language("system.availableNumNotNegative2")); } structivtService.updateById(jo_in.toJavaObject(StIvtStructivt.class)); } else { @@ -332,17 +333,17 @@ public class StorPublicServiceImpl implements StorPublicService { double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); if (Double.compare(ivt_num_now, ivt_qty) != 0) { - throw new BadRequestException("输入数据异常，请检查"); + throw new BadRequestException(LangBehavior.language("system.inputDataException")); } if (jo_in.getDoubleValue("ivt_qty") < 0) { - throw new BadRequestException("库存数不允许为负数！"); + throw new BadRequestException(LangBehavior.language("system.stockNumNotNegative")); } if (jo_in.getDoubleValue("canuse_qty") < 0) { - throw new BadRequestException("可用数不允许为负数！"); + throw new BadRequestException(LangBehavior.language("system.availableNumNotNegative2")); } structivtService.updateById(jo_in.toJavaObject(StIvtStructivt.class)); } else { - throw new BadRequestException(pcsn_In + "子卷仓位库存异常，请检查"); + throw new BadRequestException(pcsn_In + LangBehavior.language("system.subRollLocationStockException")); } break; case "31": //31加待入：入库分配、移库移入 @@ -361,11 +362,11 @@ public class StorPublicServiceImpl implements StorPublicService { if (jo_in != null) { jo_in.put("warehousing_qty", NumberUtil.sub(jo_in.getDoubleValue("warehousing_qty"), change_qty)); if (jo_in.getDoubleValue("warehousing_qty") < 0) { - throw new BadRequestException("待入数不允许为负数！"); + throw new BadRequestException(LangBehavior.language("system.pendingInNumNotNegative")); } structivtService.updateById(jo_in.toJavaObject(StIvtStructivt.class)); } else { - throw new BadRequestException(pcsn_In + "子卷仓位库存异常，请检查"); + throw new BadRequestException(pcsn_In + LangBehavior.language("system.subRollLocationStockException")); } break; case "33": //33减待入、加库存、加可用：入库确认、移库移入确认 @@ -377,14 +378,14 @@ public class StorPublicServiceImpl implements StorPublicService { double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); if (Double.compare(ivt_num_now, ivt_qty) != 0) { - throw new BadRequestException("输入数据异常，请检查"); + throw new BadRequestException(LangBehavior.language("system.inputDataException")); } if (jo_in.getDoubleValue("warehousing_qty") < 0) { - throw new BadRequestException("待入数不允许为负数！"); + throw new BadRequestException(LangBehavior.language("system.pendingInNumNotNegative")); } structivtService.updateById(jo_in.toJavaObject(StIvtStructivt.class)); } else { - throw new BadRequestException(pcsn_In + "子卷仓位库存异常，请检查"); + throw new BadRequestException(pcsn_In + LangBehavior.language("system.subRollLocationStockException")); } break; case "34": //34加待入、减库存、减可用：入库确认取消、移库移入确认取消 @@ -396,21 +397,21 @@ public class StorPublicServiceImpl implements StorPublicService { double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); if (Double.compare(ivt_num_now, ivt_qty) != 0) { - throw new BadRequestException("输入数据异常，请检查"); + throw new BadRequestException(LangBehavior.language("system.inputDataException")); } if (jo_in.getDoubleValue("ivt_qty") < 0) { - throw new BadRequestException("库存数不允许为负数！"); + throw new BadRequestException(LangBehavior.language("system.stockNumNotNegative")); } if (jo_in.getDoubleValue("canuse_qty") < 0) { - throw new BadRequestException("可用数不允许为负数！"); + throw new BadRequestException(LangBehavior.language("system.availableNumNotNegative2")); } structivtService.updateById(jo_in.toJavaObject(StIvtStructivt.class)); } else { - throw new BadRequestException(pcsn_In + "子卷仓位库存异常，请检查"); + throw new BadRequestException(pcsn_In + LangBehavior.language("system.subRollLocationStockException")); } break; default: - throw new BadRequestException("变动类型不存在:" + change_type_scode); + throw new BadRequestException(LangBehavior.language("system.changeTypeNotExist") + change_type_scode); } if (jo_in != null) { if (jo_in.getDoubleValue("ivt_qty") == 0 && jo_in.getDoubleValue("canuse_qty") == 0 && jo_in.getDoubleValue("warehousing_qty") == 0) { @@ -427,7 +428,7 @@ public class StorPublicServiceImpl implements StorPublicService { // 查询货位信息 JSONObject jo = structivtService.getStorageInfoByStrId(from.getString("struct_id")); if (jo == null) { - throw new BadRequestException("仓位不存在或者未启用：" + from.getString("struct_id")); + throw new BadRequestException(LangBehavior.language("system.locationNotExistOrInactive") + from.getString("struct_id")); } jo_in.put("stor_code", jo.getString("stor_code")); jo_in.put("stor_id", jo.getString("stor_id")); @@ -452,10 +453,10 @@ public class StorPublicServiceImpl implements StorPublicService { String storagevehicle_code = from.getString("storagevehicle_code"); String is_overdue = from.getString("is_overdue"); if (StrUtil.isEmpty(struct_id) && StrUtil.isEmpty(point_code)) { - throw new BadRequestException("点位仓位更新出入参数异常！"); + throw new BadRequestException(LangBehavior.language("system.pointLocationUpdateParamException")); } if (StrUtil.isEmpty(lock_type)) { - throw new BadRequestException("点位仓位更新出入参数异常！"); + throw new BadRequestException(LangBehavior.language("system.pointLocationUpdateParamException")); } JSONObject jo = WQL.getWO("ST_PUB_QUERY_01") .addParam("flag", "3") @@ -463,7 +464,7 @@ public class StorPublicServiceImpl implements StorPublicService { .addParam("point_code", point_code) .process().uniqueResult(0); if (jo == null) { - throw new BadRequestException("点位仓位更新未查询到符合条件的点位仓位！"); + throw new BadRequestException(LangBehavior.language("system.pointLocationNotFound")); } HashMap map = new HashMap<>(); if ("1".equals(lock_type)) { @@ -527,10 +528,10 @@ public class StorPublicServiceImpl implements StorPublicService { //载具编码 String storagevehicle_code = from.getString("storagevehicle_code"); if (StrUtil.isEmpty(struct_id) && StrUtil.isEmpty(point_code)) { - throw new BadRequestException("点位仓位更新出入参数异常！"); + throw new BadRequestException(LangBehavior.language("system.pointLocationUpdateParamException")); } if (StrUtil.isEmpty(lock_type)) { - throw new BadRequestException("点位仓位更新出入参数异常！"); + throw new BadRequestException(LangBehavior.language("system.pointLocationUpdateParamException")); } JSONObject jo = WQL.getWO("ST_PUB_QUERY_01") .addParam("flag", "3") @@ -538,7 +539,7 @@ public class StorPublicServiceImpl implements StorPublicService { .addParam("point_code", point_code) .process().uniqueResult(0); if (jo == null) { - throw new BadRequestException("点位仓位更新未查询到符合条件的点位仓位！"); + throw new BadRequestException(LangBehavior.language("system.pointLocationNotFound")); } HashMap map = new HashMap<>(); if ("1".equals(lock_type)) { @@ -580,10 +581,10 @@ public class StorPublicServiceImpl implements StorPublicService { String storagevehicle_code = from.getString("storagevehicle_code"); String is_overdue = from.getString("is_overdue"); if (StrUtil.isEmpty(struct_id) && StrUtil.isEmpty(point_code)) { - throw new BadRequestException("点位仓位更新出入参数异常！"); + throw new BadRequestException(LangBehavior.language("system.pointLocationUpdateParamException")); } if (StrUtil.isEmpty(lock_type)) { - throw new BadRequestException("点位仓位更新出入参数异常！"); + throw new BadRequestException(LangBehavior.language("system.pointLocationUpdateParamException")); } LambdaUpdateWrapper saUpLam = new LambdaUpdateWrapper<>(); if ("1".equals(lock_type)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java index 6382c97..49aac46 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java @@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.common.utils.CodeUtil; import org.nl.modules.wql.WQL; @@ -669,7 +670,7 @@ public class ChangeServiceImpl implements ChangeService { JSONObject task = wo_Task.query("task_status<>'99' and task_id='" + task_id + "'").uniqueResult(0); if (task == null) { - throw new BadRequestException("查询不到操作的任务记录！"); + throw new BadRequestException(LangBehavior.language("system.taskRecordNotFound1")); } String taskdtl_type = task.getString("taskdtl_type"); HashMap map = new HashMap<>(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java index c6bb0cc..2381d06 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java @@ -30,6 +30,7 @@ import org.nl.b_lms.storage_manage.st.service.StIvtStructattrService; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; @@ -773,7 +774,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { JSONObject task = wo_Task.query("task_status<>'99' and task_id='" + task_id + "'").uniqueResult(0); if (task == null) { - throw new BadRequestException("查询不到操作的任务记录！"); + throw new BadRequestException(LangBehavior.language("system.taskRecordNotFound1")); } String taskdtl_type = task.getString("taskdtl_type"); HashMap map = new HashMap<>(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/EmpMoveTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/EmpMoveTask.java index 92958aa..90b4162 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/EmpMoveTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/EmpMoveTask.java @@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.AcsTaskDto; @@ -75,13 +76,13 @@ public class EmpMoveTask extends AbstractAcsTask { String task_id = taskObj.getString("task_id"); if (StrUtil.isEmpty(task_id)) { - throw new BadRequestException("任务id不能为空！"); + throw new BadRequestException(LangBehavior.language("system.taskIdIsNull")); } JSONObject jsonTask = wo_Task.query("task_id='" + task_id + "'").uniqueResult(0); if (jsonTask == null) { - throw new BadRequestException("查询不到操作的任务记录！"); + throw new BadRequestException(LangBehavior.language("system.taskRecordNotFound1")); } if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { @@ -141,7 +142,7 @@ public class EmpMoveTask extends AbstractAcsTask { attrTab.update(param, "struct_code = '" + jsonTask.getString("point_code2") + "'"); } else { - throw new BadRequestException("任务状态更新异常！"); + throw new BadRequestException(LangBehavior.language("system.taskStatusUpdateException")); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java index c552d0a..c84b6fd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java @@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; @@ -99,11 +100,11 @@ public class HandMoveStorAcsTask extends AbstractAcsTask { String now = DateUtil.now(); String task_id = taskObj.getString("task_id"); if (StrUtil.isEmpty(task_id)) { - throw new BadRequestException("任务id不能为空！"); + throw new BadRequestException(LangBehavior.language("system.taskIdIsNull")); } JSONObject task = wo_Task.query("task_id='" + task_id + "'").uniqueResult(0); if (task == null) { - throw new BadRequestException("查询不到操作的任务记录！"); + throw new BadRequestException(LangBehavior.language("system.taskRecordNotFound1")); } if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { /*map.put("work_status", "02"); @@ -125,7 +126,7 @@ public class HandMoveStorAcsTask extends AbstractAcsTask { map.put("update_time", now); wo_Task.update(map, "task_id='" + task_id + "'"); } else { - throw new BadRequestException("任务状态更新异常！"); + throw new BadRequestException(LangBehavior.language("system.taskStatusUpdateException")); } } @@ -175,7 +176,7 @@ public class HandMoveStorAcsTask extends AbstractAcsTask { WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task"); JSONObject task = wo_Task.query("task_status<>'99' and task_id='" + taskdtl_id + "'").uniqueResult(0); if (task == null) { - throw new BadRequestException("查询不到操作的任务记录！"); + throw new BadRequestException(LangBehavior.language("system.taskRecordNotFound1")); } String task_id = task.getString("task_id"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java index 60a7e6f..c4bf28c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java @@ -11,6 +11,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.utils.SecurityUtils; +import org.nl.language.LangBehavior; import org.nl.modules.common.exception.BadRequestException; import org.nl.common.utils.CodeUtil; import org.nl.modules.wql.WQL; @@ -94,9 +95,9 @@ public class InEmptyvehiclerecordServiceImpl implements InEmptyvehiclerecordServ String start_point_code = dto.getStart_point_code(); String next_point_code = dto.getNext_point_code(); - // 判断起点是否为空！ 入库起点不能为空 + // 判断起点是否为空！ 入库起点不能为空! if (ObjectUtil.isEmpty(start_point_code)) { - throw new BadRequestException("起点不能为空"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } // 根据点位编码找到对应的所属区域 Long start_region_id = schBasePointService.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); @@ -134,9 +135,9 @@ public class InEmptyvehiclerecordServiceImpl implements InEmptyvehiclerecordServ String start_point_code = dto.getStart_point_code(); String next_point_code = dto.getNext_point_code(); - // 判断起点是否为空！ 入库起点不能为空 + // 判断起点是否为空！ 入库起点不能为空! if (ObjectUtil.isEmpty(start_point_code)) { - throw new BadRequestException("起点不能为空"); + throw new BadRequestException(LangBehavior.language("system.startPointIsNull")); } // 根据点位编码找到对应的所属区域 Long start_region_id = schBasePointService.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java index 6ef9c49..8b3477d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java @@ -134,7 +134,7 @@ public class OutEmptyvehiclerecordServiceImpl implements OutEmptyvehiclerecordSe String start_point_code = dto.getStart_point_code(); String next_point_code = dto.getNext_point_code(); - // 判断起点是否为空！ 入库起点不能为空 + // 判断起点是否为空！ 入库起点不能为空! if (ObjectUtil.isEmpty(next_point_code)) { throw new BadRequestException("终点不能为空"); } diff --git a/lms/nladmin-system/src/main/resources/language/i18n/en.js b/lms/nladmin-system/src/main/resources/language/i18n/en.js index dd68615..7d92ac2 100644 --- a/lms/nladmin-system/src/main/resources/language/i18n/en.js +++ b/lms/nladmin-system/src/main/resources/language/i18n/en.js @@ -45,7 +45,8 @@ var config = { "load_text2": "click to upload", "load_text3": "Only Excel files can be uploaded, and the size should not exceed 10MB", "load_text4": "File too large, please upload a file smaller than 10MB ~", - "load_text5": "Only one Excel file can be uploaded!" + "load_text5": "Only one Excel file can be uploaded!", + "mesErrorTitle": "MES Error" }, "common": { "documentNumber": "Document Number", diff --git a/lms/nladmin-system/src/main/resources/language/i18n/zh.js b/lms/nladmin-system/src/main/resources/language/i18n/zh.js index b40e0f4..49654fe 100644 --- a/lms/nladmin-system/src/main/resources/language/i18n/zh.js +++ b/lms/nladmin-system/src/main/resources/language/i18n/zh.js @@ -45,7 +45,52 @@ var config = { "load_text2": "点击上传", "load_text3": "只能上传Excel文件，且不超过10MB", "load_text4": "文件过大，请上传小于10MB的文件〜", - "load_text5": "只能上传一个excel文件！" + "load_text5": "只能上传一个excel文件！", + "mesErrorTitle": "MES提示错误", + "startPointIsNull": "起点不能为空!", + "locationNotExistOrInactive": "仓位不存在或者未启用：", + "materialNotExistOrInactive": "物料不存在或者未启用：", + "inputFromException": "输入from异常，请检查", + "changeTypeIsNull": "变动类型不能为空", + "storageLocationIsNull": "货位不能为空", + "materialIsNull": "物料不能为空", + "materialBatchIsNull": "物料批次不能为空", + "qualityTypeIsNull": "品质类型不能为空", + "changeNumException": "变动数异常，请检查", + "availableNumNotNegative1": "可用数不允许为负数！", + "inputDataException": "输入数据异常，请检查", + "subRollLocationStockException": "子卷仓位库存异常，请检查", + "stockFrozenNumException": "库存冻结数异常，请联系管理员分析处理单据！", + "stockNumNotNegative": "库存数不允许为负数！", + "frozenNumNotNegative": "冻结数不允许为负数！", + "availableNumNotNegative2": "可用数不允许为负数！", + "pendingInNumNotNegative": "待入数不允许为负数！", + "changeTypeNotExist": "变动类型不存在:", + "pointLocationUpdateParamException": "点位仓位更新出入参数异常！", + "pointLocationNotFound": "点位仓位更新未查询到符合条件的点位仓位！", + "taskIdIsNull": "任务id不能为空！", + "taskRecordNotFound1": "查询不到操作的任务记录！", + "taskStatusUpdateException": "任务状态更新异常！", + "taskIssuedCannotCancel": "任务已下发，不能取消！", + "baseRollNoNotFound": "未查询到母卷号:", + "correspondingFoilWorkOrder": "对应的生箔工单！", + "correspondingFoilMachineNo": "对应的生箔机台编号！", + "feishuErrorTitle": "飞书提示错误：", + "startAreaIsNull": "起始区域不能为空！", + "targetAreaIsNull": "目的区域不能为空！", + "subRollNoIsNull": "子卷号不能为空！", + "woodenBoxNoIsNull": "木箱号不能为空！", + "equipmentNoIsNull": "设备号不能为空!", + "subRollCountInBoxIsNull": "箱内子卷数不能为空！", + "woodenBoxGrossWeightIsNull": "木箱毛重不能为空！", + "subRollInfoInBoxIsNull": "箱内子卷信息不能为空！", + "inputSubRollNoIsNull": "传入的子卷号不能为空！", + "lockUnlockLocationIsNull": "锁定或解锁仓位不能为空!", + "subRollPackageInfoNotFound": "未查询到子卷包装信息!", + "locationInsufficient": "仓位不足!", + "locationTitle": "仓位:", + "correspondingShallowLocationError": "对应的浅货位错误!", + "correspondingDeepLocationError": "对应的深货位错误!" }, "common": { "documentNumber": "单据号", diff --git a/lms/nladmin-ui/dist.zip b/lms/nladmin-ui/dist.zip index b993c6e..8c2cf36 100644 Binary files a/lms/nladmin-ui/dist.zip and b/lms/nladmin-ui/dist.zip differ