Quellcode durchsuchen

1:供应商添加

wangming vor 2 Jahren
Ursprung
Commit
b5b6fb1d20

+ 25 - 22
ruoyi-admin/src/main/java/com/ruoyi/web/controller/scm/SupplierInfoController.java

@@ -1,20 +1,23 @@
 package com.ruoyi.web.controller.scm;
 
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.scm.domain.SupplierInfo;
-import com.ruoyi.scm.service.ISupplierInfoService;
+import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.scm.domain.SupplierInfo;
+import com.ruoyi.scm.service.ISupplierInfoService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 供应商Controller
@@ -23,25 +26,25 @@ import java.util.List;
  * @date 2022-10-12
  */
 @Controller
-@RequestMapping("/system/info")
+@RequestMapping("/scm/supplier")
 public class SupplierInfoController extends BaseController
 {
-    private String prefix = "system/info";
+    private String prefix = "scm/supplier";
 
     @Autowired
     private ISupplierInfoService supplierInfoService;
 
-    @RequiresPermissions("system:info:view")
+    @RequiresPermissions("scm:supplier:view")
     @GetMapping()
-    public String info()
+    public String supplier()
     {
-        return prefix + "/info";
+        return prefix + "/supplier";
     }
 
     /**
      * 查询供应商列表
      */
-    @RequiresPermissions("system:info:list")
+    @RequiresPermissions("scm:supplier:list")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(SupplierInfo supplierInfo)
@@ -54,7 +57,7 @@ public class SupplierInfoController extends BaseController
     /**
      * 导出供应商列表
      */
-    @RequiresPermissions("system:info:export")
+    @RequiresPermissions("scm:supplier:export")
     @Log(title = "供应商", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
@@ -77,7 +80,7 @@ public class SupplierInfoController extends BaseController
     /**
      * 新增保存供应商
      */
-    @RequiresPermissions("system:info:add")
+    @RequiresPermissions("scm:supplier:add")
     @Log(title = "供应商", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -89,7 +92,7 @@ public class SupplierInfoController extends BaseController
     /**
      * 修改供应商
      */
-    @RequiresPermissions("system:info:edit")
+    @RequiresPermissions("scm:supplier:edit")
     @GetMapping("/edit/{id}")
     public String edit(@PathVariable("id") String id, ModelMap mmap)
     {
@@ -101,7 +104,7 @@ public class SupplierInfoController extends BaseController
     /**
      * 修改保存供应商
      */
-    @RequiresPermissions("system:info:edit")
+    @RequiresPermissions("scm:supplier:edit")
     @Log(title = "供应商", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
@@ -113,7 +116,7 @@ public class SupplierInfoController extends BaseController
     /**
      * 删除供应商
      */
-    @RequiresPermissions("system:info:remove")
+    @RequiresPermissions("scm:supplier:remove")
     @Log(title = "供应商", businessType = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody

+ 44 - 52
ruoyi-admin/src/main/resources/templates/scm/supplier/add.html

@@ -7,7 +7,7 @@
 </head>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-info-add">
+        <form class="form-horizontal m" id="form-supplier-add">
             <div class="form-group">    
                 <label class="col-sm-3 control-label is-required">主键id:</label>
                 <div class="col-sm-8">
@@ -15,9 +15,9 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">中胜的id:</label>
+                <label class="col-sm-3 control-label is-required">中盛的id:</label>
                 <div class="col-sm-8">
-                    <input name="zsId" class="form-control" type="text">
+                    <input name="zsId" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
@@ -33,115 +33,107 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">供应商地址:</label>
+                <label class="col-sm-3 control-label is-required">供应商地址:</label>
                 <div class="col-sm-8">
-                    <input name="address" class="form-control" type="text">
+                    <input name="address" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">供应商详细地址:</label>
+                <label class="col-sm-3 control-label is-required">供应商详细地址:</label>
                 <div class="col-sm-8">
-                    <input name="detailAddress" class="form-control" type="text">
+                    <input name="detailAddress" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">png、jpg:</label>
+                <label class="col-sm-3 control-label is-required">logo:</label>
                 <div class="col-sm-8">
-                    <input name="logo" class="form-control" type="text">
+                    <input name="logo" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">选项,省市县:</label>
+                <label class="col-sm-3 control-label is-required">省市县:</label>
                 <div class="col-sm-8">
-                    <input name="businessAddress" class="form-control" type="text">
+                    <input name="businessAddress" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">邮编:</label>
+                <label class="col-sm-3 control-label is-required">邮编:</label>
                 <div class="col-sm-8">
-                    <input name="postCode" class="form-control" type="text">
+                    <input name="postCode" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">官网网址:</label>
+                <label class="col-sm-3 control-label is-required">官网网址:</label>
                 <div class="col-sm-8">
-                    <input name="website" class="form-control" type="text">
+                    <input name="website" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">供应商电话:</label>
+                <label class="col-sm-3 control-label is-required">供应商电话:</label>
                 <div class="col-sm-8">
-                    <input name="supplierPhone" class="form-control" type="text">
+                    <input name="supplierPhone" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">传真:</label>
+                <label class="col-sm-3 control-label is-required">传真:</label>
                 <div class="col-sm-8">
-                    <input name="fax" class="form-control" type="text">
+                    <input name="fax" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">供应商联系人:</label>
+                <label class="col-sm-3 control-label is-required">供应商联系人:</label>
                 <div class="col-sm-8">
-                    <input name="supplierMan" class="form-control" type="text">
+                    <input name="supplierMan" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">联系人电话:</label>
+                <label class="col-sm-3 control-label is-required">联系人电话:</label>
                 <div class="col-sm-8">
-                    <input name="manPhone" class="form-control" type="text">
+                    <input name="manPhone" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">供应商性质  0:国有企业  1:私营企业  2:个人独资 3:集体企业和外资企业:</label>
+                <label class="col-sm-3 control-label is-required">供应商性质:</label>
                 <div class="col-sm-8">
-                    <select name="supplierNature" class="form-control m-b" th:with="type=${@dict.getType('supplier_nature')}">
+                    <select name="supplierNature" class="form-control m-b" th:with="type=${@dict.getType('supplier_nature')}" required>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">供应商行业:</label>
+                <label class="col-sm-3 control-label is-required">供应商行业:</label>
                 <div class="col-sm-8">
-                    <input name="supplierBusiness" class="form-control" type="text">
+                    <input name="supplierBusiness" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">供应商规模 0:大型企业  1:中型企业  2:小型企业  3:微型企业:</label>
+                <label class="col-sm-3 control-label is-required">供应商规模:</label>
                 <div class="col-sm-8">
-                    <select name="supplierScale" class="form-control m-b" th:with="type=${@dict.getType('supplier_scale')}">
+                    <select name="supplierScale" class="form-control m-b" th:with="type=${@dict.getType('supplier_scale')}" required>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">供应商类型 0:生产制造 1:批发代理 2:零售经销  3:特许经营  4;工程施工  5:一般商业服务 6:社会事业服务  7:其他:</label>
+                <label class="col-sm-3 control-label is-required">企业是否上市:</label>
                 <div class="col-sm-8">
-                    <select name="supplierType" class="form-control m-b" th:with="type=${@dict.getType('supplier_type')}">
+                    <select name="isMarket" class="form-control m-b" th:with="type=${@dict.getType('is_or_no')}" required>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">企业是否上市 0:是  1:否:</label>
+                <label class="col-sm-3 control-label is-required">是否是品牌商:</label>
                 <div class="col-sm-8">
-                    <select name="isMarket" class="form-control m-b" th:with="type=${@dict.getType('is_or_no')}">
+                    <select name="isBrand" class="form-control m-b" th:with="type=${@dict.getType('is_or_no')}" required>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">是否是品牌商  0:是  1:否:</label>
+                <label class="col-sm-3 control-label is-required">供应商介绍:</label>
                 <div class="col-sm-8">
-                    <select name="isBrand" class="form-control m-b" th:with="type=${@dict.getType('is_or_no')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">供应商介绍:</label>
-                <div class="col-sm-8">
-                    <input name="supplierDesc" class="form-control" type="text">
+                    <input name="supplierDesc" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
@@ -184,7 +176,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">是否长期有效0:是  1:非:</label>
+                <label class="col-sm-3 control-label">是否长期有效:</label>
                 <div class="col-sm-8">
                     <select name="isValid" class="form-control m-b" th:with="type=${@dict.getType('is_or_no')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -198,7 +190,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">币种0:人民币  1:美元  3:英镑:</label>
+                <label class="col-sm-3 control-label">币种:</label>
                 <div class="col-sm-8">
                     <select name="currency" class="form-control m-b" th:with="type=${@dict.getType('currency')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -260,7 +252,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">出资币种0:人民币  1:美元  3:英镑:</label>
+                <label class="col-sm-3 control-label">出资币种:</label>
                 <div class="col-sm-8">
                     <select name="contributCurrency" class="form-control m-b" th:with="type=${@dict.getType('currency')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -280,7 +272,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">是否经过注册会计师年审0:是   1:否:</label>
+                <label class="col-sm-3 control-label">是否经过注册会计师年审:</label>
                 <div class="col-sm-8">
                     <select name="financialIsAccountant" class="form-control m-b" th:with="type=${@dict.getType('is_or_no')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -359,7 +351,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">所得税,单位万:</label>
                 <div class="col-sm-8">
-                    <input name="income tax" class="form-control" type="text">
+                    <input name="incomeTax" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
@@ -389,7 +381,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">证件号码 0:身份中  1:护照  2:解放军军人证件  3:警察身份证件  4:港澳通行证  5:台湾居民来往通行证  6:其他有效证件:</label>
+                <label class="col-sm-3 control-label">证件号码:</label>
                 <div class="col-sm-8">
                     <input name="papersNumber" class="form-control" type="text">
                 </div>
@@ -481,14 +473,14 @@
     <th:block th:include="include :: datetimepicker-js" />
     <th:block th:include="include :: bootstrap-fileinput-js"/>
     <script th:inline="javascript">
-        var prefix = ctx + "system/info"
-        $("#form-info-add").validate({
+        var prefix = ctx + "scm/supplier"
+        $("#form-supplier-add").validate({
             focusCleanup: true
         });
 
         function submitHandler() {
             if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-info-add').serialize());
+                $.operate.save(prefix + "/add", $('#form-supplier-add').serialize());
             }
         }
 

+ 44 - 52
ruoyi-admin/src/main/resources/templates/scm/supplier/edit.html

@@ -7,12 +7,12 @@
 </head>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-info-edit" th:object="${supplierInfo}">
+        <form class="form-horizontal m" id="form-supplier-edit" th:object="${supplierInfo}">
             <input name="id" th:field="*{id}" type="hidden">
             <div class="form-group">    
-                <label class="col-sm-3 control-label">中胜的id:</label>
+                <label class="col-sm-3 control-label is-required">中盛的id:</label>
                 <div class="col-sm-8">
-                    <input name="zsId" th:field="*{zsId}" class="form-control" type="text">
+                    <input name="zsId" th:field="*{zsId}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
@@ -28,115 +28,107 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">供应商地址:</label>
+                <label class="col-sm-3 control-label is-required">供应商地址:</label>
                 <div class="col-sm-8">
-                    <input name="address" th:field="*{address}" class="form-control" type="text">
+                    <input name="address" th:field="*{address}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">供应商详细地址:</label>
+                <label class="col-sm-3 control-label is-required">供应商详细地址:</label>
                 <div class="col-sm-8">
-                    <input name="detailAddress" th:field="*{detailAddress}" class="form-control" type="text">
+                    <input name="detailAddress" th:field="*{detailAddress}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">png、jpg:</label>
+                <label class="col-sm-3 control-label is-required">logo:</label>
                 <div class="col-sm-8">
-                    <input name="logo" th:field="*{logo}" class="form-control" type="text">
+                    <input name="logo" th:field="*{logo}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">选项,省市县:</label>
+                <label class="col-sm-3 control-label is-required">省市县:</label>
                 <div class="col-sm-8">
-                    <input name="businessAddress" th:field="*{businessAddress}" class="form-control" type="text">
+                    <input name="businessAddress" th:field="*{businessAddress}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">邮编:</label>
+                <label class="col-sm-3 control-label is-required">邮编:</label>
                 <div class="col-sm-8">
-                    <input name="postCode" th:field="*{postCode}" class="form-control" type="text">
+                    <input name="postCode" th:field="*{postCode}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">官网网址:</label>
+                <label class="col-sm-3 control-label is-required">官网网址:</label>
                 <div class="col-sm-8">
-                    <input name="website" th:field="*{website}" class="form-control" type="text">
+                    <input name="website" th:field="*{website}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">供应商电话:</label>
+                <label class="col-sm-3 control-label is-required">供应商电话:</label>
                 <div class="col-sm-8">
-                    <input name="supplierPhone" th:field="*{supplierPhone}" class="form-control" type="text">
+                    <input name="supplierPhone" th:field="*{supplierPhone}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">传真:</label>
+                <label class="col-sm-3 control-label is-required">传真:</label>
                 <div class="col-sm-8">
-                    <input name="fax" th:field="*{fax}" class="form-control" type="text">
+                    <input name="fax" th:field="*{fax}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">供应商联系人:</label>
+                <label class="col-sm-3 control-label is-required">供应商联系人:</label>
                 <div class="col-sm-8">
-                    <input name="supplierMan" th:field="*{supplierMan}" class="form-control" type="text">
+                    <input name="supplierMan" th:field="*{supplierMan}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">联系人电话:</label>
+                <label class="col-sm-3 control-label is-required">联系人电话:</label>
                 <div class="col-sm-8">
-                    <input name="manPhone" th:field="*{manPhone}" class="form-control" type="text">
+                    <input name="manPhone" th:field="*{manPhone}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">供应商性质  0:国有企业  1:私营企业  2:个人独资 3:集体企业和外资企业:</label>
+                <label class="col-sm-3 control-label is-required">供应商性质:</label>
                 <div class="col-sm-8">
-                    <select name="supplierNature" class="form-control m-b" th:with="type=${@dict.getType('supplier_nature')}">
+                    <select name="supplierNature" class="form-control m-b" th:with="type=${@dict.getType('supplier_nature')}" required>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{supplierNature}"></option>
                     </select>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">供应商行业:</label>
+                <label class="col-sm-3 control-label is-required">供应商行业:</label>
                 <div class="col-sm-8">
-                    <input name="supplierBusiness" th:field="*{supplierBusiness}" class="form-control" type="text">
+                    <input name="supplierBusiness" th:field="*{supplierBusiness}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">供应商规模 0:大型企业  1:中型企业  2:小型企业  3:微型企业:</label>
+                <label class="col-sm-3 control-label is-required">供应商规模:</label>
                 <div class="col-sm-8">
-                    <select name="supplierScale" class="form-control m-b" th:with="type=${@dict.getType('supplier_scale')}">
+                    <select name="supplierScale" class="form-control m-b" th:with="type=${@dict.getType('supplier_scale')}" required>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{supplierScale}"></option>
                     </select>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">供应商类型 0:生产制造 1:批发代理 2:零售经销  3:特许经营  4;工程施工  5:一般商业服务 6:社会事业服务  7:其他:</label>
+                <label class="col-sm-3 control-label is-required">企业是否上市:</label>
                 <div class="col-sm-8">
-                    <select name="supplierType" class="form-control m-b" th:with="type=${@dict.getType('supplier_type')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{supplierType}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">企业是否上市 0:是  1:否:</label>
-                <div class="col-sm-8">
-                    <select name="isMarket" class="form-control m-b" th:with="type=${@dict.getType('is_or_no')}">
+                    <select name="isMarket" class="form-control m-b" th:with="type=${@dict.getType('is_or_no')}" required>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{isMarket}"></option>
                     </select>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">是否是品牌商  0:是  1:否:</label>
+                <label class="col-sm-3 control-label is-required">是否是品牌商:</label>
                 <div class="col-sm-8">
-                    <select name="isBrand" class="form-control m-b" th:with="type=${@dict.getType('is_or_no')}">
+                    <select name="isBrand" class="form-control m-b" th:with="type=${@dict.getType('is_or_no')}" required>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{isBrand}"></option>
                     </select>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">供应商介绍:</label>
+                <label class="col-sm-3 control-label is-required">供应商介绍:</label>
                 <div class="col-sm-8">
-                    <input name="supplierDesc" th:field="*{supplierDesc}" class="form-control" type="text">
+                    <input name="supplierDesc" th:field="*{supplierDesc}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
@@ -179,7 +171,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">是否长期有效0:是  1:非:</label>
+                <label class="col-sm-3 control-label">是否长期有效:</label>
                 <div class="col-sm-8">
                     <select name="isValid" class="form-control m-b" th:with="type=${@dict.getType('is_or_no')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{isValid}"></option>
@@ -193,7 +185,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">币种0:人民币  1:美元  3:英镑:</label>
+                <label class="col-sm-3 control-label">币种:</label>
                 <div class="col-sm-8">
                     <select name="currency" class="form-control m-b" th:with="type=${@dict.getType('currency')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{currency}"></option>
@@ -255,7 +247,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">出资币种0:人民币  1:美元  3:英镑:</label>
+                <label class="col-sm-3 control-label">出资币种:</label>
                 <div class="col-sm-8">
                     <select name="contributCurrency" class="form-control m-b" th:with="type=${@dict.getType('currency')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{contributCurrency}"></option>
@@ -275,7 +267,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">是否经过注册会计师年审0:是   1:否:</label>
+                <label class="col-sm-3 control-label">是否经过注册会计师年审:</label>
                 <div class="col-sm-8">
                     <select name="financialIsAccountant" class="form-control m-b" th:with="type=${@dict.getType('is_or_no')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{financialIsAccountant}"></option>
@@ -354,7 +346,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">所得税,单位万:</label>
                 <div class="col-sm-8">
-                    <input name="income tax" th:field="*{income tax}" class="form-control" type="text">
+                    <input name="incomeTax" th:field="*{incomeTax}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
@@ -384,7 +376,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">证件号码 0:身份中  1:护照  2:解放军军人证件  3:警察身份证件  4:港澳通行证  5:台湾居民来往通行证  6:其他有效证件:</label>
+                <label class="col-sm-3 control-label">证件号码:</label>
                 <div class="col-sm-8">
                     <input name="papersNumber" th:field="*{papersNumber}" class="form-control" type="text">
                 </div>
@@ -476,14 +468,14 @@
     <th:block th:include="include :: datetimepicker-js" />
     <th:block th:include="include :: bootstrap-fileinput-js"/>
     <script th:inline="javascript">
-        var prefix = ctx + "system/info";
-        $("#form-info-edit").validate({
+        var prefix = ctx + "scm/supplier";
+        $("#form-supplier-edit").validate({
             focusCleanup: true
         });
 
         function submitHandler() {
             if ($.validate.form()) {
-                $.operate.save(prefix + "/edit", $('#form-info-edit').serialize());
+                $.operate.save(prefix + "/edit", $('#form-supplier-edit').serialize());
             }
         }
 

+ 35 - 46
ruoyi-admin/src/main/resources/templates/scm/supplier/supplier.html

@@ -11,7 +11,7 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <label>中的id:</label>
+                                <label>中的id:</label>
                                 <input type="text" name="zsId"/>
                             </li>
                             <li>
@@ -31,11 +31,11 @@
                                 <input type="text" name="detailAddress"/>
                             </li>
                             <li>
-                                <label>png、jpg:</label>
+                                <label>logo:</label>
                                 <input type="text" name="logo"/>
                             </li>
                             <li>
-                                <label>选项,省市县:</label>
+                                <label>省市县:</label>
                                 <input type="text" name="businessAddress"/>
                             </li>
                             <li>
@@ -63,7 +63,7 @@
                                 <input type="text" name="manPhone"/>
                             </li>
                             <li>
-                                <label>供应商性质  0:国有企业  1:私营企业  2:个人独资 3:集体企业和外资企业:</label>
+                                <label>供应商性质:</label>
                                 <select name="supplierNature" th:with="type=${@dict.getType('supplier_nature')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -74,28 +74,21 @@
                                 <input type="text" name="supplierBusiness"/>
                             </li>
                             <li>
-                                <label>供应商规模 0:大型企业  1:中型企业  2:小型企业  3:微型企业:</label>
+                                <label>供应商规模:</label>
                                 <select name="supplierScale" th:with="type=${@dict.getType('supplier_scale')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
                             <li>
-                                <label>供应商类型 0:生产制造 1:批发代理 2:零售经销  3:特许经营  4;工程施工  5:一般商业服务 6:社会事业服务  7:其他:</label>
-                                <select name="supplierType" th:with="type=${@dict.getType('supplier_type')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-                            <li>
-                                <label>企业是否上市 0:是  1:否:</label>
+                                <label>企业是否上市:</label>
                                 <select name="isMarket" th:with="type=${@dict.getType('is_or_no')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
                             <li>
-                                <label>是否是品牌商  0:是  1:否:</label>
+                                <label>是否是品牌商:</label>
                                 <select name="isBrand" th:with="type=${@dict.getType('is_or_no')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -126,7 +119,7 @@
                                 <input type="text" class="time-input" placeholder="请选择营业有效时间" name="toDate"/>
                             </li>
                             <li>
-                                <label>是否长期有效0:是  1:非:</label>
+                                <label>是否长期有效:</label>
                                 <select name="isValid" th:with="type=${@dict.getType('is_or_no')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -137,7 +130,7 @@
                                 <input type="text" name="capital"/>
                             </li>
                             <li>
-                                <label>币种0:人民币  1:美元  3:英镑:</label>
+                                <label>币种:</label>
                                 <select name="currency" th:with="type=${@dict.getType('currency')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -164,7 +157,7 @@
                                 <input type="text" name="contributNum"/>
                             </li>
                             <li>
-                                <label>出资币种0:人民币  1:美元  3:英镑:</label>
+                                <label>出资币种:</label>
                                 <select name="contributCurrency" th:with="type=${@dict.getType('currency')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -179,7 +172,7 @@
                                 <input type="text" name="financialAnnualList"/>
                             </li>
                             <li>
-                                <label>是否经过注册会计师年审0:是   1:否:</label>
+                                <label>是否经过注册会计师年审:</label>
                                 <select name="financialIsAccountant" th:with="type=${@dict.getType('is_or_no')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -227,7 +220,7 @@
                             </li>
                             <li>
                                 <label>所得税,单位万:</label>
-                                <input type="text" name="income tax"/>
+                                <input type="text" name="incomeTax"/>
                             </li>
                             <li>
                                 <label>净利润,单位万:</label>
@@ -249,7 +242,7 @@
                                 </select>
                             </li>
                             <li>
-                                <label>证件号码 0:身份中  1:护照  2:解放军军人证件  3:警察身份证件  4:港澳通行证  5:台湾居民来往通行证  6:其他有效证件:</label>
+                                <label>证件号码:</label>
                                 <input type="text" name="papersNumber"/>
                             </li>
                             <li>
@@ -310,16 +303,16 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:info:add">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="scm:supplier:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:info:edit">
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="scm:supplier:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:info:remove">
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="scm:supplier:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:info:export">
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="scm:supplier:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -330,11 +323,10 @@
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('system:info:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:info:remove')}]];
+        var editFlag = [[${@permission.hasPermi('scm:supplier:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('scm:supplier:remove')}]];
         var supplierNatureDatas = [[${@dict.getType('supplier_nature')}]];
         var supplierScaleDatas = [[${@dict.getType('supplier_scale')}]];
-        var supplierTypeDatas = [[${@dict.getType('supplier_type')}]];
         var isMarketDatas = [[${@dict.getType('is_or_no')}]];
         var isBrandDatas = [[${@dict.getType('is_or_no')}]];
         var isValidDatas = [[${@dict.getType('is_or_no')}]];
@@ -342,7 +334,7 @@
         var contributCurrencyDatas = [[${@dict.getType('currency')}]];
         var financialIsAccountantDatas = [[${@dict.getType('is_or_no')}]];
         var papersTypeDatas = [[${@dict.getType('papers_number')}]];
-        var prefix = ctx + "system/info";
+        var prefix = ctx + "scm/supplier";
 
         $(function() {
             var options = {
@@ -357,7 +349,7 @@
                 },
                 {
                     field: 'zsId',
-                    title: '中的id'
+                    title: '中的id'
                 },
                 {
                     field: 'supplierName',
@@ -377,11 +369,11 @@
                 },
                 {
                     field: 'logo',
-                    title: 'png、jpg'
+                    title: 'logo'
                 },
                 {
                     field: 'businessAddress',
-                    title: '选项,省市县'
+                    title: '省市县'
                 },
                 {
                     field: 'postCode',
@@ -409,7 +401,7 @@
                 },
                 {
                     field: 'supplierNature',
-                    title: '供应商性质  0:国有企业  1:私营企业  2:个人独资 3:集体企业和外资企业',
+                    title: '供应商性质',
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(supplierNatureDatas, value);
                     }
@@ -420,28 +412,25 @@
                 },
                 {
                     field: 'supplierScale',
-                    title: '供应商规模 0:大型企业  1:中型企业  2:小型企业  3:微型企业',
+                    title: '供应商规模',
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(supplierScaleDatas, value);
                     }
                 },
                 {
                     field: 'supplierType',
-                    title: '供应商类型 0:生产制造 1:批发代理 2:零售经销  3:特许经营  4;工程施工  5:一般商业服务 6:社会事业服务  7:其他',
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(supplierTypeDatas, value);
-                    }
+                    title: '供应商类型'
                 },
                 {
                     field: 'isMarket',
-                    title: '企业是否上市 0:是  1:否',
+                    title: '企业是否上市',
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(isMarketDatas, value);
                     }
                 },
                 {
                     field: 'isBrand',
-                    title: '是否是品牌商  0:是  1:否',
+                    title: '是否是品牌商',
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(isBrandDatas, value);
                     }
@@ -472,7 +461,7 @@
                 },
                 {
                     field: 'isValid',
-                    title: '是否长期有效0:是  1:非',
+                    title: '是否长期有效',
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(isValidDatas, value);
                     }
@@ -483,7 +472,7 @@
                 },
                 {
                     field: 'currency',
-                    title: '币种0:人民币  1:美元  3:英镑',
+                    title: '币种',
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(currencyDatas, value);
                     }
@@ -522,7 +511,7 @@
                 },
                 {
                     field: 'contributCurrency',
-                    title: '出资币种0:人民币  1:美元  3:英镑',
+                    title: '出资币种',
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(contributCurrencyDatas, value);
                     }
@@ -537,7 +526,7 @@
                 },
                 {
                     field: 'financialIsAccountant',
-                    title: '是否经过注册会计师年审0:是   1:否',
+                    title: '是否经过注册会计师年审',
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(financialIsAccountantDatas, value);
                     }
@@ -587,7 +576,7 @@
                     title: '利润总额,单位万'
                 },
                 {
-                    field: 'income tax',
+                    field: 'incomeTax',
                     title: '所得税,单位万'
                 },
                 {
@@ -619,7 +608,7 @@
                 },
                 {
                     field: 'papersNumber',
-                    title: '证件号码 0:身份中  1:护照  2:解放军军人证件  3:警察身份证件  4:港澳通行证  5:台湾居民来往通行证  6:其他有效证件'
+                    title: '证件号码'
                 },
                 {
                     field: 'headPhone',
@@ -651,7 +640,7 @@
                 },
                 {
                     field: 'status',
-                    title: '上下架情况 0:上架申请中'
+                    title: '上下架情况'
                 },
                 {
                     field: 'refuseMsg',

+ 31 - 31
ruoyi-system/src/main/java/com/ruoyi/scm/domain/SupplierInfo.java

@@ -20,8 +20,8 @@ public class SupplierInfo extends BaseEntity
     /** 主键id(uuid) */
     private String id;
 
-    /** 中的id */
-    @Excel(name = "中的id")
+    /** 中的id */
+    @Excel(name = "中的id")
     private String zsId;
 
     /** 供应商名称 */
@@ -40,12 +40,12 @@ public class SupplierInfo extends BaseEntity
     @Excel(name = "供应商详细地址")
     private String detailAddress;
 
-    /** png、jpg */
-    @Excel(name = "png、jpg")
+    /** logo */
+    @Excel(name = "logo")
     private String logo;
 
-    /** 选项,省市县 */
-    @Excel(name = "选项,省市县")
+    /** 省市县 */
+    @Excel(name = "省市县")
     private String businessAddress;
 
     /** 邮编 */
@@ -72,28 +72,28 @@ public class SupplierInfo extends BaseEntity
     @Excel(name = "联系人电话")
     private String manPhone;
 
-    /** 供应商性质  0:国有企业  1:私营企业  2:个人独资 3:集体企业和外资企业 */
-    @Excel(name = "供应商性质  0:国有企业  1:私营企业  2:个人独资 3:集体企业和外资企业")
+    /** 供应商性质 */
+    @Excel(name = "供应商性质")
     private String supplierNature;
 
     /** 供应商行业 */
     @Excel(name = "供应商行业")
     private String supplierBusiness;
 
-    /** 供应商规模 0:大型企业  1:中型企业  2:小型企业  3:微型企业 */
-    @Excel(name = "供应商规模 0:大型企业  1:中型企业  2:小型企业  3:微型企业")
+    /** 供应商规模 */
+    @Excel(name = "供应商规模")
     private String supplierScale;
 
-    /** 供应商类型 0:生产制造 1:批发代理 2:零售经销  3:特许经营  4;工程施工  5:一般商业服务 6:社会事业服务  7:其他 */
-    @Excel(name = "供应商类型 0:生产制造 1:批发代理 2:零售经销  3:特许经营  4;工程施工  5:一般商业服务 6:社会事业服务  7:其他")
+    /** 供应商类型 */
+    @Excel(name = "供应商类型")
     private String supplierType;
 
-    /** 企业是否上市 0:是  1:否 */
-    @Excel(name = "企业是否上市 0:是  1:否")
+    /** 企业是否上市 */
+    @Excel(name = "企业是否上市")
     private String isMarket;
 
-    /** 是否是品牌商  0:是  1:否 */
-    @Excel(name = "是否是品牌商  0:是  1:否")
+    /** 是否是品牌商 */
+    @Excel(name = "是否是品牌商")
     private String isBrand;
 
     /** 供应商介绍 */
@@ -121,16 +121,16 @@ public class SupplierInfo extends BaseEntity
     @Excel(name = "营业有效时间", readConverterExp = "止=")
     private Date toDate;
 
-    /** 是否长期有效0:是  1:非 */
-    @Excel(name = "是否长期有效0:是  1:非")
+    /** 是否长期有效 */
+    @Excel(name = "是否长期有效")
     private String isValid;
 
     /** 注册资本,单位(万元) */
     @Excel(name = "注册资本,单位", readConverterExp = "万=元")
     private String capital;
 
-    /** 币种0:人民币  1:美元  3:英镑 */
-    @Excel(name = "币种0:人民币  1:美元  3:英镑")
+    /** 币种 */
+    @Excel(name = "币种")
     private String currency;
 
     /** 营业范围 */
@@ -161,8 +161,8 @@ public class SupplierInfo extends BaseEntity
     @Excel(name = "出资总额,单位万")
     private String contributNum;
 
-    /** 出资币种0:人民币  1:美元  3:英镑 */
-    @Excel(name = "出资币种0:人民币  1:美元  3:英镑")
+    /** 出资币种 */
+    @Excel(name = "出资币种")
     private String contributCurrency;
 
     /** 出资人列表 */
@@ -173,8 +173,8 @@ public class SupplierInfo extends BaseEntity
     @Excel(name = "年度报表")
     private String financialAnnualList;
 
-    /** 是否经过注册会计师年审0:是   1:否 */
-    @Excel(name = "是否经过注册会计师年审0:是   1:否")
+    /** 是否经过注册会计师年审 */
+    @Excel(name = "是否经过注册会计师年审")
     private String financialIsAccountant;
 
     /** 财务备注 */
@@ -249,8 +249,8 @@ public class SupplierInfo extends BaseEntity
     @Excel(name = "证件类型")
     private String papersType;
 
-    /** 证件号码 0:身份中  1:护照  2:解放军军人证件  3:警察身份证件  4:港澳通行证  5:台湾居民来往通行证  6:其他有效证件 */
-    @Excel(name = "证件号码 0:身份中  1:护照  2:解放军军人证件  3:警察身份证件  4:港澳通行证  5:台湾居民来往通行证  6:其他有效证件")
+    /** 证件号码 */
+    @Excel(name = "证件号码")
     private String papersNumber;
 
     /** 手机号码 */
@@ -281,8 +281,8 @@ public class SupplierInfo extends BaseEntity
     @Excel(name = "反面盖章图片")
     private String consPicture;
 
-    /** 上下架情况 0:上架申请中(新添加的供应商默认状态)  10:上架申请通过   15:上架申请拒绝   20:下架申请  25:下架申请通过 */
-    @Excel(name = "上下架情况 0:上架申请中", readConverterExp = "新=添加的供应商默认状态")
+    /** 上下架情况 */
+    @Excel(name = "上下架情况")
     private String status;
 
     /** 上架申请拒绝原因 */
@@ -767,12 +767,12 @@ public class SupplierInfo extends BaseEntity
     {
         return salesTotal;
     }
-    public void setIncomeTax(String incomeTax)
+    public void setIncomeTax(String incomeTax) 
     {
         this.incomeTax = incomeTax;
     }
 
-    public String getIncomeTax()
+    public String getIncomeTax() 
     {
         return incomeTax;
     }
@@ -1012,7 +1012,7 @@ public class SupplierInfo extends BaseEntity
             .append("operatingReceipt", getOperatingReceipt())
             .append("salesTax", getSalesTax())
             .append("salesTotal", getSalesTotal())
-            .append("income tax", getIncomeTax())
+            .append("incomeTax", getIncomeTax())
             .append("profitTotal", getProfitTotal())
             .append("salesProfitTotal", getSalesProfitTotal())
             .append("headerName", getHeaderName())

+ 1 - 2
ruoyi-system/src/main/java/com/ruoyi/scm/mapper/SupplierInfoMapper.java

@@ -1,8 +1,7 @@
 package com.ruoyi.scm.mapper;
 
-import com.ruoyi.scm.domain.SupplierInfo;
-
 import java.util.List;
+import com.ruoyi.scm.domain.SupplierInfo;
 
 /**
  * 供应商Mapper接口

+ 1 - 2
ruoyi-system/src/main/java/com/ruoyi/scm/service/ISupplierInfoService.java

@@ -1,8 +1,7 @@
 package com.ruoyi.scm.service;
 
-import com.ruoyi.scm.domain.SupplierInfo;
-
 import java.util.List;
+import com.ruoyi.scm.domain.SupplierInfo;
 
 /**
  * 供应商Service接口

+ 4 - 5
ruoyi-system/src/main/java/com/ruoyi/scm/service/impl/SupplierInfoServiceImpl.java

@@ -1,12 +1,11 @@
 package com.ruoyi.scm.service.impl;
 
 import java.util.List;
-
-import com.ruoyi.scm.domain.SupplierInfo;
-import com.ruoyi.scm.mapper.SupplierInfoMapper;
-import com.ruoyi.scm.service.ISupplierInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.ruoyi.scm.mapper.SupplierInfoMapper;
+import com.ruoyi.scm.domain.SupplierInfo;
+import com.ruoyi.scm.service.ISupplierInfoService;
 import com.ruoyi.common.core.text.Convert;
 
 /**
@@ -16,7 +15,7 @@ import com.ruoyi.common.core.text.Convert;
  * @date 2022-10-12
  */
 @Service
-public class SupplierInfoServiceImpl implements ISupplierInfoService
+public class SupplierInfoServiceImpl implements ISupplierInfoService 
 {
     @Autowired
     private SupplierInfoMapper supplierInfoMapper;

+ 63 - 63
ruoyi-system/src/main/resources/mapper/supplier/SupplierInfoMapper.xml

@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="operatingReceipt"    column="operating_receipt"    />
         <result property="salesTax"    column="sales_tax"    />
         <result property="salesTotal"    column="sales_total"    />
-        <result property="income tax"    column="income tax"    />
+        <result property="incomeTax"    column="income_tax"    />
         <result property="profitTotal"    column="profit_total"    />
         <result property="salesProfitTotal"    column="sales_profit_total"    />
         <result property="headerName"    column="header_name"    />
@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSupplierInfoVo">
-        select id, zs_id, supplier_name, supplier_re_name, address, detail_address, logo, business_address, post_code, website, supplier_phone, fax, supplier_man, man_phone, supplier_nature, supplier_business, supplier_scale, supplier_type, is_market, is_brand, supplier_desc, supplier_code, registration, establishment_date, from_date, to_date, is_valid, capital, currency, business_scope, business_scan_file, remark, employee_num, social_num, social_file, contribut_prove, contribut_num, contribut_currency, contribut_list, financial_annual_list, financial_is_accountant, financial_remark, financial_file, asset_total, debt_invest_total, debt_equity_total, debt_total, capital_total, debt_rate, operating_receipt, sales_tax, sales_total, income tax, profit_total, sales_profit_total, header_name, type, job_type, papers_type, papers_number, head_phone, header_phone, header_mail, header_address, header_post_code, pros_picture, cons_picture, status, refuse_msg, sold_out_msg, putaway_time, start_time, end_time from supplier_info
+        select id, zs_id, supplier_name, supplier_re_name, address, detail_address, logo, business_address, post_code, website, supplier_phone, fax, supplier_man, man_phone, supplier_nature, supplier_business, supplier_scale, supplier_type, is_market, is_brand, supplier_desc, supplier_code, registration, establishment_date, from_date, to_date, is_valid, capital, currency, business_scope, business_scan_file, remark, employee_num, social_num, social_file, contribut_prove, contribut_num, contribut_currency, contribut_list, financial_annual_list, financial_is_accountant, financial_remark, financial_file, asset_total, debt_invest_total, debt_equity_total, debt_total, capital_total, debt_rate, operating_receipt, sales_tax, sales_total, income_tax, profit_total, sales_profit_total, header_name, type, job_type, papers_type, papers_number, head_phone, header_phone, header_mail, header_address, header_post_code, pros_picture, cons_picture, status, refuse_msg, sold_out_msg, putaway_time, start_time, end_time from supplier_info
     </sql>
 
     <select id="selectSupplierInfoList" parameterType="SupplierInfo" resultMap="SupplierInfoResult">
@@ -137,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="operatingReceipt != null  and operatingReceipt != ''"> and operating_receipt = #{operatingReceipt}</if>
             <if test="salesTax != null  and salesTax != ''"> and sales_tax = #{salesTax}</if>
             <if test="salesTotal != null  and salesTotal != ''"> and sales_total = #{salesTotal}</if>
-            <if test="income tax != null  and income tax != ''"> and income tax = #{income tax}</if>
+            <if test="incomeTax != null  and incomeTax != ''"> and income_tax = #{incomeTax}</if>
             <if test="profitTotal != null  and profitTotal != ''"> and profit_total = #{profitTotal}</if>
             <if test="salesProfitTotal != null  and salesProfitTotal != ''"> and sales_profit_total = #{salesProfitTotal}</if>
             <if test="headerName != null  and headerName != ''"> and header_name like concat('%', #{headerName}, '%')</if>
@@ -170,26 +170,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into supplier_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null and id != ''">id,</if>
-            <if test="zsId != null">zs_id,</if>
+            <if test="zsId != null and zsId != ''">zs_id,</if>
             <if test="supplierName != null and supplierName != ''">supplier_name,</if>
             <if test="supplierReName != null and supplierReName != ''">supplier_re_name,</if>
-            <if test="address != null">address,</if>
-            <if test="detailAddress != null">detail_address,</if>
-            <if test="logo != null">logo,</if>
-            <if test="businessAddress != null">business_address,</if>
-            <if test="postCode != null">post_code,</if>
-            <if test="website != null">website,</if>
-            <if test="supplierPhone != null">supplier_phone,</if>
-            <if test="fax != null">fax,</if>
-            <if test="supplierMan != null">supplier_man,</if>
-            <if test="manPhone != null">man_phone,</if>
-            <if test="supplierNature != null">supplier_nature,</if>
-            <if test="supplierBusiness != null">supplier_business,</if>
-            <if test="supplierScale != null">supplier_scale,</if>
-            <if test="supplierType != null">supplier_type,</if>
-            <if test="isMarket != null">is_market,</if>
-            <if test="isBrand != null">is_brand,</if>
-            <if test="supplierDesc != null">supplier_desc,</if>
+            <if test="address != null and address != ''">address,</if>
+            <if test="detailAddress != null and detailAddress != ''">detail_address,</if>
+            <if test="logo != null and logo != ''">logo,</if>
+            <if test="businessAddress != null and businessAddress != ''">business_address,</if>
+            <if test="postCode != null and postCode != ''">post_code,</if>
+            <if test="website != null and website != ''">website,</if>
+            <if test="supplierPhone != null and supplierPhone != ''">supplier_phone,</if>
+            <if test="fax != null and fax != ''">fax,</if>
+            <if test="supplierMan != null and supplierMan != ''">supplier_man,</if>
+            <if test="manPhone != null and manPhone != ''">man_phone,</if>
+            <if test="supplierNature != null and supplierNature != ''">supplier_nature,</if>
+            <if test="supplierBusiness != null and supplierBusiness != ''">supplier_business,</if>
+            <if test="supplierScale != null and supplierScale != ''">supplier_scale,</if>
+            <if test="supplierType != null and supplierType != ''">supplier_type,</if>
+            <if test="isMarket != null and isMarket != ''">is_market,</if>
+            <if test="isBrand != null and isBrand != ''">is_brand,</if>
+            <if test="supplierDesc != null and supplierDesc != ''">supplier_desc,</if>
             <if test="supplierCode != null">supplier_code,</if>
             <if test="registration != null">registration,</if>
             <if test="establishmentDate != null">establishment_date,</if>
@@ -221,7 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="operatingReceipt != null">operating_receipt,</if>
             <if test="salesTax != null">sales_tax,</if>
             <if test="salesTotal != null">sales_total,</if>
-            <if test="income tax != null">income tax,</if>
+            <if test="incomeTax != null">income_tax,</if>
             <if test="profitTotal != null">profit_total,</if>
             <if test="salesProfitTotal != null">sales_profit_total,</if>
             <if test="headerName != null">header_name,</if>
@@ -236,7 +236,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="headerPostCode != null">header_post_code,</if>
             <if test="prosPicture != null">pros_picture,</if>
             <if test="consPicture != null">cons_picture,</if>
-            <if test="status != null">status,</if>
+            <if test="status != null and status != ''">status,</if>
             <if test="refuseMsg != null">refuse_msg,</if>
             <if test="soldOutMsg != null">sold_out_msg,</if>
             <if test="putawayTime != null">putaway_time,</if>
@@ -245,26 +245,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null and id != ''">#{id},</if>
-            <if test="zsId != null">#{zsId},</if>
+            <if test="zsId != null and zsId != ''">#{zsId},</if>
             <if test="supplierName != null and supplierName != ''">#{supplierName},</if>
             <if test="supplierReName != null and supplierReName != ''">#{supplierReName},</if>
-            <if test="address != null">#{address},</if>
-            <if test="detailAddress != null">#{detailAddress},</if>
-            <if test="logo != null">#{logo},</if>
-            <if test="businessAddress != null">#{businessAddress},</if>
-            <if test="postCode != null">#{postCode},</if>
-            <if test="website != null">#{website},</if>
-            <if test="supplierPhone != null">#{supplierPhone},</if>
-            <if test="fax != null">#{fax},</if>
-            <if test="supplierMan != null">#{supplierMan},</if>
-            <if test="manPhone != null">#{manPhone},</if>
-            <if test="supplierNature != null">#{supplierNature},</if>
-            <if test="supplierBusiness != null">#{supplierBusiness},</if>
-            <if test="supplierScale != null">#{supplierScale},</if>
-            <if test="supplierType != null">#{supplierType},</if>
-            <if test="isMarket != null">#{isMarket},</if>
-            <if test="isBrand != null">#{isBrand},</if>
-            <if test="supplierDesc != null">#{supplierDesc},</if>
+            <if test="address != null and address != ''">#{address},</if>
+            <if test="detailAddress != null and detailAddress != ''">#{detailAddress},</if>
+            <if test="logo != null and logo != ''">#{logo},</if>
+            <if test="businessAddress != null and businessAddress != ''">#{businessAddress},</if>
+            <if test="postCode != null and postCode != ''">#{postCode},</if>
+            <if test="website != null and website != ''">#{website},</if>
+            <if test="supplierPhone != null and supplierPhone != ''">#{supplierPhone},</if>
+            <if test="fax != null and fax != ''">#{fax},</if>
+            <if test="supplierMan != null and supplierMan != ''">#{supplierMan},</if>
+            <if test="manPhone != null and manPhone != ''">#{manPhone},</if>
+            <if test="supplierNature != null and supplierNature != ''">#{supplierNature},</if>
+            <if test="supplierBusiness != null and supplierBusiness != ''">#{supplierBusiness},</if>
+            <if test="supplierScale != null and supplierScale != ''">#{supplierScale},</if>
+            <if test="supplierType != null and supplierType != ''">#{supplierType},</if>
+            <if test="isMarket != null and isMarket != ''">#{isMarket},</if>
+            <if test="isBrand != null and isBrand != ''">#{isBrand},</if>
+            <if test="supplierDesc != null and supplierDesc != ''">#{supplierDesc},</if>
             <if test="supplierCode != null">#{supplierCode},</if>
             <if test="registration != null">#{registration},</if>
             <if test="establishmentDate != null">#{establishmentDate},</if>
@@ -296,7 +296,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="operatingReceipt != null">#{operatingReceipt},</if>
             <if test="salesTax != null">#{salesTax},</if>
             <if test="salesTotal != null">#{salesTotal},</if>
-            <if test="income tax != null">#{income tax},</if>
+            <if test="incomeTax != null">#{incomeTax},</if>
             <if test="profitTotal != null">#{profitTotal},</if>
             <if test="salesProfitTotal != null">#{salesProfitTotal},</if>
             <if test="headerName != null">#{headerName},</if>
@@ -311,7 +311,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="headerPostCode != null">#{headerPostCode},</if>
             <if test="prosPicture != null">#{prosPicture},</if>
             <if test="consPicture != null">#{consPicture},</if>
-            <if test="status != null">#{status},</if>
+            <if test="status != null and status != ''">#{status},</if>
             <if test="refuseMsg != null">#{refuseMsg},</if>
             <if test="soldOutMsg != null">#{soldOutMsg},</if>
             <if test="putawayTime != null">#{putawayTime},</if>
@@ -323,26 +323,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateSupplierInfo" parameterType="SupplierInfo">
         update supplier_info
         <trim prefix="SET" suffixOverrides=",">
-            <if test="zsId != null">zs_id = #{zsId},</if>
+            <if test="zsId != null and zsId != ''">zs_id = #{zsId},</if>
             <if test="supplierName != null and supplierName != ''">supplier_name = #{supplierName},</if>
             <if test="supplierReName != null and supplierReName != ''">supplier_re_name = #{supplierReName},</if>
-            <if test="address != null">address = #{address},</if>
-            <if test="detailAddress != null">detail_address = #{detailAddress},</if>
-            <if test="logo != null">logo = #{logo},</if>
-            <if test="businessAddress != null">business_address = #{businessAddress},</if>
-            <if test="postCode != null">post_code = #{postCode},</if>
-            <if test="website != null">website = #{website},</if>
-            <if test="supplierPhone != null">supplier_phone = #{supplierPhone},</if>
-            <if test="fax != null">fax = #{fax},</if>
-            <if test="supplierMan != null">supplier_man = #{supplierMan},</if>
-            <if test="manPhone != null">man_phone = #{manPhone},</if>
-            <if test="supplierNature != null">supplier_nature = #{supplierNature},</if>
-            <if test="supplierBusiness != null">supplier_business = #{supplierBusiness},</if>
-            <if test="supplierScale != null">supplier_scale = #{supplierScale},</if>
-            <if test="supplierType != null">supplier_type = #{supplierType},</if>
-            <if test="isMarket != null">is_market = #{isMarket},</if>
-            <if test="isBrand != null">is_brand = #{isBrand},</if>
-            <if test="supplierDesc != null">supplier_desc = #{supplierDesc},</if>
+            <if test="address != null and address != ''">address = #{address},</if>
+            <if test="detailAddress != null and detailAddress != ''">detail_address = #{detailAddress},</if>
+            <if test="logo != null and logo != ''">logo = #{logo},</if>
+            <if test="businessAddress != null and businessAddress != ''">business_address = #{businessAddress},</if>
+            <if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
+            <if test="website != null and website != ''">website = #{website},</if>
+            <if test="supplierPhone != null and supplierPhone != ''">supplier_phone = #{supplierPhone},</if>
+            <if test="fax != null and fax != ''">fax = #{fax},</if>
+            <if test="supplierMan != null and supplierMan != ''">supplier_man = #{supplierMan},</if>
+            <if test="manPhone != null and manPhone != ''">man_phone = #{manPhone},</if>
+            <if test="supplierNature != null and supplierNature != ''">supplier_nature = #{supplierNature},</if>
+            <if test="supplierBusiness != null and supplierBusiness != ''">supplier_business = #{supplierBusiness},</if>
+            <if test="supplierScale != null and supplierScale != ''">supplier_scale = #{supplierScale},</if>
+            <if test="supplierType != null and supplierType != ''">supplier_type = #{supplierType},</if>
+            <if test="isMarket != null and isMarket != ''">is_market = #{isMarket},</if>
+            <if test="isBrand != null and isBrand != ''">is_brand = #{isBrand},</if>
+            <if test="supplierDesc != null and supplierDesc != ''">supplier_desc = #{supplierDesc},</if>
             <if test="supplierCode != null">supplier_code = #{supplierCode},</if>
             <if test="registration != null">registration = #{registration},</if>
             <if test="establishmentDate != null">establishment_date = #{establishmentDate},</if>
@@ -374,7 +374,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="operatingReceipt != null">operating_receipt = #{operatingReceipt},</if>
             <if test="salesTax != null">sales_tax = #{salesTax},</if>
             <if test="salesTotal != null">sales_total = #{salesTotal},</if>
-            <if test="income tax != null">income tax = #{income tax},</if>
+            <if test="incomeTax != null">income_tax = #{incomeTax},</if>
             <if test="profitTotal != null">profit_total = #{profitTotal},</if>
             <if test="salesProfitTotal != null">sales_profit_total = #{salesProfitTotal},</if>
             <if test="headerName != null">header_name = #{headerName},</if>
@@ -389,7 +389,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="headerPostCode != null">header_post_code = #{headerPostCode},</if>
             <if test="prosPicture != null">pros_picture = #{prosPicture},</if>
             <if test="consPicture != null">cons_picture = #{consPicture},</if>
-            <if test="status != null">status = #{status},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
             <if test="refuseMsg != null">refuse_msg = #{refuseMsg},</if>
             <if test="soldOutMsg != null">sold_out_msg = #{soldOutMsg},</if>
             <if test="putawayTime != null">putaway_time = #{putawayTime},</if>