rev:客户信息，供应商信息分类异常

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/customer/controller/BmCustomerController.java

@@ -31,7 +31,7 @@ import java.util.*;
  **/
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/customerbase")
+@RequestMapping("/api/bmCustomer")
 @Slf4j
 public class BmCustomerController {
 

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/controller/BmSupplierController.java

@@ -2,11 +2,15 @@
 package org.nl.wms.base_manage.supplier.controller;
 
 
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.entity.PageQuery;
+import org.nl.common.utils.IdUtil;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.base_manage.supplier.service.IBmSupplierService;
 import org.nl.wms.base_manage.supplier.service.dao.BmSupplier;
 import org.nl.wms.base_manage.supplier.service.dto.SupplierQuery;
@@ -39,6 +43,10 @@ public class BmSupplierController {
 
     @PostMapping
     public ResponseEntity<Object> create(@Validated @RequestBody BmSupplier dto) {
+        dto.setSupp_id(IdUtil.getLongId());
+        dto.setCreate_id(SecurityUtils.getCurrentUserId());
+        dto.setCreate_name(SecurityUtils.getCurrentNickName());
+        dto.setCreate_time(DateUtil.now());
         supplierService.save(dto);
         return new ResponseEntity<>(HttpStatus.OK);
     }
@@ -46,7 +54,10 @@ public class BmSupplierController {
 
     @PutMapping
     public ResponseEntity<Object> update(@Validated @RequestBody BmSupplier dto) {
-        supplierService.update(dto, new LambdaUpdateWrapper<BmSupplier>().eq(BmSupplier::getSupp_id, dto.getSupp_id()));
+        dto.setUpdate_id(SecurityUtils.getCurrentUserId());
+        dto.setUpdate_name(SecurityUtils.getCurrentNickName());
+        dto.setUpdate_time(DateUtil.now());
+        supplierService.update(dto,new LambdaQueryWrapper<BmSupplier>().eq(BmSupplier::getSupp_id,dto.getSupp_id()));
         return new ResponseEntity<>(HttpStatus.OK);
     }
 

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dao/BmSupplier.java

@@ -129,10 +129,6 @@ public class BmSupplier implements Serializable {
      */
     private String ext_id;
 
-    /**
-     * 条码打印起始值
-     */
-    private String barcode_print;
 
     /**
      * 备注
@@ -142,20 +138,7 @@ public class BmSupplier implements Serializable {
     /**
      * 分类标识
      */
-    private Long class_id;
+    private String class_id;
 
-    /**
-     * 分类编码
-     */
-    private String class_code;
 
-    /**
-     * 分类名称
-     */
-    private String class_name;
-
-    /**
-     * 资金计划履约天数
-     */
-    private BigDecimal honour_days;
 }

wms_pro/qd/src/views/wms/base_manage/customer/index.vue

@@ -230,7 +230,7 @@ export default {
   cruds() {
     return CRUD({
       title: '客户基础表',
-      url: 'api/customerbase',
+      url: 'api/bmCustomer',
       optShow: {
         add: true,
         reset: true
@@ -283,9 +283,25 @@ export default {
     },
     [CRUD.HOOK.afterToCU](crud, form) {
       if (form.class_id != null) {
-        this.getSubTypes({'id': form.class_id, 'parent_id': '1704039126057226240'})
+        //this.getSubTypes({'id': form.class_id, 'parent_id': '1704039126057226240'})
+        const param = {
+          parent_class_code: ''
+        }
+        crudClassstandard.getClassType(param).then(res => {
+          const data = res.content
+          this.buildClass(data)
+          this.classes = data
+        })
       } else {
-        this.getClass()
+        // this.getClass()
+        const param = {
+          parent_class_code: ''
+        }
+        crudClassstandard.getClassType(param).then(res => {
+          const data = res.content
+          this.buildClass(data)
+          this.classes = data
+        })
       }
     },
     getSubTypes(id) {

wms_pro/qd/src/views/wms/base_manage/supplier/index.vue

@@ -74,13 +74,19 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="条码打印起始值">
-                <el-input v-model="form.barcode_print" style="width: 200px;" />
+              <el-form-item label="邮政编码">
+                <el-input v-model="form.zip_code" style="width: 200px;" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="邮政编码">
-                <el-input v-model="form.zip_code" style="width: 200px;" />
+              <el-form-item label="基础分类" prop="class_id">
+                <treeselect
+                  v-model="form.class_id"
+                  :load-options="loadClass"
+                  :options="classes"
+                  style="width: 200px;"
+                  placeholder="请选择"
+                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -108,22 +114,7 @@
                 <el-input v-model="form.ext_id" style="width: 200px;" />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="资金计划履约天数">
-                <el-input v-model="form.honour_days" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="基础分类" prop="class_id">
-                <treeselect
-                  v-model="form.class_id"
-                  :load-options="loadClass"
-                  :options="classes"
-                  style="width: 200px;"
-                  placeholder="请选择"
-                />
-              </el-form-item>
-            </el-col>
+
           </el-row>
           <el-form-item label="备注">
             <el-input v-model="form.remark" style="width: 600px;" type="textarea" />
@@ -148,7 +139,7 @@
         <el-table-column prop="corp_address" label="公司地址" />
         <el-table-column prop="corp_tele_no" label="公司电话" />
         <el-table-column prop="jurid_name" label="法人代表" />
-        <el-table-column prop="update_optname" label="修改者" />
+        <el-table-column prop="update_name" label="修改者" />
         <el-table-column prop="update_time" label="修改时间" width="150" />
         <el-table-column label="启用" align="center" prop="is_used">
           <template slot-scope="scope">
@@ -209,17 +200,15 @@ const defaultForm = {
   create_id: null,
   create_name: null,
   create_time: null,
-  update_optid: null,
-  update_optname: null,
+  update_id: null,
+  update_name: null,
   update_time: null,
   is_used_time: null,
   is_used: '1',
   is_delete: null,
   ext_id: null,
-  barcode_print: null,
-  class_code: null,
+  class_id: null,
   remark: null,
-  honour_days: null
 }
 export default {
   name: 'Supplier',
@@ -279,9 +268,25 @@ export default {
     },
     [CRUD.HOOK.afterToCU](crud, form) {
       if (form.class_id != null) {
-        this.getSubTypes({ 'id': form.class_id, 'parent_id': '1704039126057226240' })
+        const param = {
+          parent_class_code: ''
+        }
+        crudClassstandard.getClassType(param).then(res => {
+          const data = res.content
+          this.buildClass(data)
+          this.classes = data
+        })
+        // this.getSubTypes({ 'id': form.class_id, 'parent_id': '1704039126057226240' })
       } else {
-        this.getClass()
+        // this.getClass()
+        const param = {
+          parent_class_code: ''
+        }
+        crudClassstandard.getClassType(param).then(res => {
+          const data = res.content
+          this.buildClass(data)
+          this.classes = data
+        })
       }
     },
     getSubTypes(id) {