From 3bdd9ff957f30b7190e1b51d1541021460b5d959 Mon Sep 17 00:00:00 2001 From: zxy Date: Fri, 20 Mar 2026 16:57:19 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99=E5=A4=A7=E7=B1=BB?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8F=8A=E5=88=97=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E5=B9=B6=E8=B0=83=E6=95=B4=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=97=E4=BD=8D=E7=BD=AE;=202.=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=96=B0=E5=A2=9E=E8=A1=A8=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=A4=A7=E7=B1=BB=E5=BF=85=E5=A1=AB=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C;=203.=E4=BC=98=E5=8C=96=E7=89=A9=E6=96=99=E5=A4=A7?= =?UTF-8?q?=E7=B1=BB=E7=BC=96=E7=A0=81=E6=9C=80=E5=A4=A7=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E5=8F=B7=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91=EF=BC=8C=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=A0=B9=E6=8D=AE=E4=BC=A0=E5=85=A5=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=AF=94=E5=AF=B9=E6=9B=B4=E6=96=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heli/service/matcode/MatCodeService.java | 7 ++++++- .../heli/service/matcode/MatCodeServiceImpl.java | 16 +++++++++++++--- .../service/material/MaterialServiceImpl.java | 2 +- .../src/views/heli/material/MaterialForm.vue | 1 + .../src/views/heli/material/index.vue | 11 +++++++++-- 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/matcode/MatCodeService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/matcode/MatCodeService.java index 97d1819c..f3a9367b 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/matcode/MatCodeService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/matcode/MatCodeService.java @@ -31,7 +31,12 @@ public interface MatCodeService { void updateMatCode(@Valid MatCodeSaveReqVO updateReqVO); - void updateCurMaxSeq(String matTypeCode); + /** + * 更新当前最大流水号 + * @param matTypeCode 物料大类编码 + * @param code 物料编码 + */ + void updateCurMaxSeq(String matTypeCode,String code); /** * 删除物料大类编码维护 diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/matcode/MatCodeServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/matcode/MatCodeServiceImpl.java index 21a45e23..34f907bd 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/matcode/MatCodeServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/matcode/MatCodeServiceImpl.java @@ -73,13 +73,23 @@ public class MatCodeServiceImpl implements MatCodeService { @Override - public void updateCurMaxSeq(String matTypeCode) { + public void updateCurMaxSeq(String matTypeCode, String code) { MatCodeDO matCode = getByMatCatCode(matTypeCode); - String string = getString(matCode.getCurMaxSeq()); - matCode.setCurMaxSeq(string); + int typeNum = matCode.getMatTypeCode().length(); + // 截取 最大流水号 + String maxSeq = code.substring(typeNum); + String seq; + // 判断输入的流水号是否大于当前流水号 + if (Integer.parseInt(maxSeq) >= Integer.parseInt(matCode.getCurMaxSeq())) { + seq= maxSeq; + }else { + seq = matCode.getCurMaxSeq(); + } + matCode.setCurMaxSeq(seq); matCodeMapper.updateById(matCode); } + /** * 校验物料大类编码唯一性 * diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialServiceImpl.java index 5ff9ca4d..17e58f26 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialServiceImpl.java @@ -146,7 +146,7 @@ public class MaterialServiceImpl implements MaterialService { validateMaterialRepeat(updateObj.getCode(), updateReqVO.getId()); materialMapper.updateById(updateObj); // 更新物料大类最大流水 - matCodeService.updateCurMaxSeq(updateObj.getMatCate()); + matCodeService.updateCurMaxSeq(updateObj.getMatCate(),updateObj.getCode()); } @Override diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue index ff4a26bb..e70e3b19 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue @@ -169,6 +169,7 @@ const formRules = reactive({ status: [{ required: true, message: '启用状态不能为空', trigger: 'blur' }], materialType: [{ required: true, message: '物料类型不能为空', trigger: 'change' }], unit: [{ required: true, message: '系统单位不能为空', trigger: 'change' }], + matCate: [{ required: true, message: '物料大类不能为空', trigger: 'change' }], }) const formRef = ref() // 表单 Ref diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/material/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/material/index.vue index 703de92f..2afd9a41 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/material/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/material/index.vue @@ -90,11 +90,12 @@ - + +