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 @@ - + +