客户信息 供应商信息 编码可编辑且唯一

客户信息 供应商信息 编码可编辑且唯一

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/customer/CustomerServiceImpl.java

@@ -1,6 +1,8 @@
 package com.chanko.yunxi.mes.module.heli.service.customer;
 
 import cn.hutool.core.lang.UUID;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -36,10 +38,10 @@ public class CustomerServiceImpl implements CustomerService {
     public Long createCustomer(CustomerSaveReqVO createReqVO) {
         // 插入
         CustomerDO customer = BeanUtils.toBean(createReqVO, CustomerDO.class);
-        customer.setCode(UUID.fastUUID().toString(true));
+        // 重复性判断
+        validateCustomerRepeat(customer.getCode(), customer.getId());
         customerMapper.insert(customer);
-        customer.setCode(CUSTOMER.getCode(customer.getId().toString()));
-        customerMapper.updateById(customer);
+
         // 返回
         return customer.getId();
     }
@@ -50,6 +52,8 @@ public class CustomerServiceImpl implements CustomerService {
         validateCustomerExists(updateReqVO.getId());
         // 更新
         CustomerDO updateObj = BeanUtils.toBean(updateReqVO, CustomerDO.class);
+        // 重复性判断
+        validateCustomerRepeat(updateObj.getCode(), updateReqVO.getId());
         customerMapper.updateById(updateObj);
     }
 
@@ -77,4 +81,15 @@ public class CustomerServiceImpl implements CustomerService {
         return customerMapper.selectPage(pageReqVO);
     }
 
+    private void validateCustomerRepeat(String code, Long id) {
+        Long repeat = customerMapper.selectCount(new LambdaQueryWrapper<CustomerDO>() {{
+            eq(CustomerDO::getCode, code);
+            ne(id != null, CustomerDO::getId, id);
+            last("LIMIT 1");
+        }});
+        if(repeat != null && repeat.longValue() > 0){
+            throw exception(CODE_REPEAT);
+        }
+    }
+
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/supplier/SupplierServiceImpl.java

@@ -1,6 +1,8 @@
 package com.chanko.yunxi.mes.module.heli.service.supplier;
 
 import cn.hutool.core.lang.UUID;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.customer.CustomerDO;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -36,11 +38,9 @@ public class SupplierServiceImpl implements SupplierService {
     public Long createSupplier(SupplierSaveReqVO createReqVO) {
         // 插入
         SupplierDO supplier = BeanUtils.toBean(createReqVO, SupplierDO.class);
-        supplier.setCode(UUID.fastUUID().toString(true));
+        // 重复性判断
+        validateSupllierRepeat(supplier.getCode(), supplier.getId());
         supplierMapper.insert(supplier);
-
-        supplier.setCode(SUPPLIER.getCode(supplier.getId().toString()));
-        supplierMapper.updateById(supplier);
         // 返回
         return supplier.getId();
     }
@@ -51,6 +51,8 @@ public class SupplierServiceImpl implements SupplierService {
         validateSupplierExists(updateReqVO.getId());
         // 更新
         SupplierDO updateObj = BeanUtils.toBean(updateReqVO, SupplierDO.class);
+        // 重复性判断
+        validateSupllierRepeat(updateObj.getCode(), updateReqVO.getId());
         supplierMapper.updateById(updateObj);
     }
 
@@ -78,4 +80,14 @@ public class SupplierServiceImpl implements SupplierService {
         return supplierMapper.selectPage(pageReqVO);
     }
 
+    private void validateSupllierRepeat(String code, Long id) {
+        Long repeat = supplierMapper.selectCount(new LambdaQueryWrapper<SupplierDO>() {{
+            eq(SupplierDO::getCode, code);
+            ne(id != null, SupplierDO::getId, id);
+            last("LIMIT 1");
+        }});
+        if(repeat != null && repeat.longValue() > 0){
+            throw exception(CODE_REPEAT);
+        }
+    }
 }

mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue

@@ -19,8 +19,8 @@
             <el-col :span="8">
               <el-row>
                 <el-col :span="24">
-                  <el-form-item prop="code" label="客户编码">
-                    <el-input v-model="formData.code" disabled />
+                  <el-form-item prop="code" label="客户编码" required="">
+                    <el-input v-model="formData.code"  />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -331,7 +331,7 @@ const formData = ref({
   taxNo: undefined
 })
 const formRules = reactive({
-  // code: [{ required: true, message: '客户编码不能为空', trigger: 'blur' }],
+  code: [{ required: true, message: '客户编码不能为空', trigger: 'blur' }],
   brief: [{ required: true, message: '客户简称不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '客户全称不能为空', trigger: 'blur' }]
   // status: [{ required: true, message: '状态,1 表示正常，2 表示禁用不能为空', trigger: 'blur' }],

mes-ui/mes-ui-admin-vue3/src/views/heli/supplier/SupplierForm.vue

@@ -19,8 +19,8 @@
             <el-col :span="8">
               <el-row>
                 <el-col :span="24">
-                  <el-form-item prop="code" label="供应商编码" >
-                    <el-input v-model="formData.code" disabled />
+                  <el-form-item prop="code" label="供应商编码" required="" >
+                    <el-input v-model="formData.code"  />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -341,7 +341,7 @@ const formData = ref({
   taxNo: undefined,
 })
 const formRules = reactive({
-  // code: [{ required: true, message: '供应商编码不能为空', trigger: 'blur' }],
+  code: [{ required: true, message: '供应商编码不能为空', trigger: 'blur' }],
   brief: [{ required: true, message: '供应商简称不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '供应商全称不能为空', trigger: 'blur' }],
   // status: [{ required: true, message: '状态,1 表示正常，2 表示禁用不能为空', trigger: 'blur' }],