From 6cb4e6647b0e2e8c0cafa38a07666e07709bcf54 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 19 一月 2026 13:06:05 +0800
Subject: [PATCH] 物料新增,修改功能 优化

---
 src/main/java/com/zy/api/controller/params/PageRequestParams.java |    1 
 src/main/java/com/zy/asrs/utils/MatExcelListener.java             |   68 +++++++------
 src/main/webapp/static/js/mat/mat.js                              |   10 +-
 src/main/webapp/views/mat/mat.html                                |   48 ++++-----
 src/main/java/com/zy/asrs/entity/Mat.java                         |   39 ++++---
 src/main/java/com/zy/api/entity/ReportOrderParam.java             |    2 
 src/main/resources/application-dev.yml                            |    2 
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java      |   42 +------
 src/main/java/com/zy/common/entity/MatExcel.java                  |    6 
 src/main/java/com/zy/asrs/controller/MatController.java           |   36 ++++++-
 src/main/webapp/static/js/common.js                               |    2 
 11 files changed, 127 insertions(+), 129 deletions(-)

diff --git a/src/main/java/com/zy/api/controller/params/PageRequestParams.java b/src/main/java/com/zy/api/controller/params/PageRequestParams.java
index cccda32..77f858c 100644
--- a/src/main/java/com/zy/api/controller/params/PageRequestParams.java
+++ b/src/main/java/com/zy/api/controller/params/PageRequestParams.java
@@ -11,7 +11,6 @@
 
     private String pro_komcode;
 
-    
     private String pro_id;
 }
 
diff --git a/src/main/java/com/zy/api/entity/ReportOrderParam.java b/src/main/java/com/zy/api/entity/ReportOrderParam.java
index 139cdce..b5c998c 100644
--- a/src/main/java/com/zy/api/entity/ReportOrderParam.java
+++ b/src/main/java/com/zy/api/entity/ReportOrderParam.java
@@ -15,4 +15,6 @@
     @ApiModelProperty("涓婃姤璁㈠崟鍒楄〃")
     List<ReportOrderParams> details;
 
+    @ApiModelProperty("璁㈠崟鏄庣粏")
+    private List<OrderItemsParam> partList;
 }
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 04785d0..f387127 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -10,13 +10,16 @@
 import com.core.annotations.ManagerAuth;
 import com.core.common.*;
 import com.core.exception.CoolException;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.MatPrint;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.BatchMatsUpdateParam;
 import com.zy.asrs.entity.param.EmptyPlateOutParam;
 import com.zy.asrs.entity.result.KeyValueVo;
 import com.zy.asrs.service.MatService;
+import com.zy.asrs.service.TaskDetlService;
+import com.zy.asrs.service.TaskService;
+import com.zy.asrs.service.impl.TaskDetlServiceImpl;
+import com.zy.asrs.service.impl.WaitPakinServiceImpl;
+import com.zy.asrs.service.impl.WrkDetlServiceImpl;
 import com.zy.asrs.utils.MatExcelListener;
 import com.zy.common.CodeRes;
 import com.zy.common.config.AdminInterceptor;
@@ -43,6 +46,12 @@
     private MatService matService;
     @Autowired
     private SnowflakeIdWorker snowflakeIdWorker;
+    @Autowired
+    private WaitPakinServiceImpl waitPakinService;
+    @Autowired
+    private WrkDetlServiceImpl wrkDetlService;
+    @Autowired
+    private TaskDetlService taskDetlService;
 
     @RequestMapping(value = "/mat/auto/matnr/auth")
     public R autoMatnr() {
@@ -149,21 +158,36 @@
         return R.ok();
     }
 
-    @PostMapping("mat/batch/auth")
     @ManagerAuth
+    @PostMapping("mat/batch/auth")
     public R batchUpdate(@RequestBody BatchMatsUpdateParam params) {
 
-        return  matService.batchInfo(params);
+        return matService.batchInfo(params);
     }
 
-    @RequestMapping(value = "/mat/delete/auth")
     @ManagerAuth
+    @RequestMapping(value = "/mat/delete/auth")
     public R delete(@RequestParam String param) {
         List<Mat> list = JSONArray.parseArray(param, Mat.class);
         if (Cools.isEmpty(list)) {
             return R.error();
         }
         for (Mat entity : list) {
+            int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>()
+                    .eq("supp_code", entity.getSuppCode())
+                    .eq("matnr", entity.getMatnr()));
+
+            int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>()
+                    .eq("supp_code", entity.getSuppCode())
+                    .eq("matnr", entity.getMatnr()));
+
+            int taskCount = taskDetlService.selectCount(new EntityWrapper<TaskDetl>()
+                    .eq("supp_code", entity.getSuppCode())
+                    .eq("matnr", entity.getMatnr()));
+
+            if (pakinCount > 0 || wrkCount > 0 || taskCount > 0) {
+                throw new CoolException(entity.getMatnr() + "鍦ㄤ綔涓氭竻鍗曚腑锛屾棤娉曟墽琛屽垹闄ゆ搷浣滐紒锛�");
+            }
             if (!matService.delete(new EntityWrapper<>(entity))) {
                 throw new CoolException("鍒犻櫎澶辫触锛岃鑱旂郴绠$悊鍛�");
             }
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 6efecb1..c8a2d7b 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -56,6 +56,7 @@
      */
     @ApiModelProperty(value= "鎵�灞炲綊绫�")
     @TableField("tag_id")
+//    @ExcelProperty(value = "鍟嗗搧绫诲瀷")
     private Long tagId;
 
     /**
@@ -77,35 +78,35 @@
      * 鍒悕
      */
     @ApiModelProperty(value= "鍒悕")
-    @ExcelProperty(value = "鍒悕")
+//    @ExcelProperty(value = "鍒悕")
     private String name;
 
     /**
      * 瑙勬牸
      */
     @ApiModelProperty(value= "瑙勬牸")
-    @ExcelProperty(value = "瑙勬牸")
+    @ExcelProperty(value = "灏哄")
     private String specs;
 
     /**
      * 鍨嬪彿
      */
     @ApiModelProperty(value= "鍨嬪彿")
-    @ExcelProperty(value = "鍨嬪彿")
+//    @ExcelProperty(value = "鍨嬪彿")
     private String model;
 
     /**
      * 棰滆壊
      */
     @ApiModelProperty(value= "棰滆壊")
-    @ExcelProperty(value = "棰滆壊")
+//    @ExcelProperty(value = "棰滆壊")
     private String color;
 
     /**
      * 鍝佺墝
      */
     @ApiModelProperty(value= "鍝佺墝")
-    @ExcelProperty(value = "鍝佺墝")
+//    @ExcelProperty(value = "鍝佺墝")
     private String brand;
 
     /**
@@ -119,42 +120,42 @@
      * 鍗曚环
      */
     @ApiModelProperty(value= "鍗曚环")
-    @ExcelProperty(value = "鍗曚环")
+//    @ExcelProperty(value = "鍗曚环")
     private Double price;
 
     /**
      * sku
      */
     @ApiModelProperty(value= "sku")
-    @ExcelProperty(value = "sku")
+//    @ExcelProperty(value = "sku")
     private String sku;
 
     /**
      * 鍗曚綅閲�
      */
     @ApiModelProperty(value= "鍗曚綅閲�")
-    @ExcelProperty(value = "鍗曚綅閲�")
+//    @ExcelProperty(value = "鍗曚綅閲�")
     private Double units;
 
     /**
      * 鏉$爜
      */
     @ApiModelProperty(value= "鏉$爜")
-    @ExcelProperty(value = "鏉$爜")
+//    @ExcelProperty(value = "鏉$爜")
     private String barcode;
 
     /**
      * 浜у湴
      */
     @ApiModelProperty(value= "浜у湴")
-    @ExcelProperty(value = "浜у湴")
+//    @ExcelProperty(value = "浜у湴")
     private String origin;
 
     /**
      * 鍘傚
      */
     @ApiModelProperty(value= "鍘傚")
-    @ExcelProperty(value = "鍘傚")
+    @ExcelProperty(value = "鍏徃")
     private String manu;
 
     /**
@@ -169,7 +170,7 @@
      * 鍝侀」鏁�/鏈�澶х粍鎵樻暟閲�
      */
     @ApiModelProperty(value= "鍝侀」鏁�")
-    @ExcelProperty(value = "鍝侀」鏁�")
+//    @ExcelProperty(value = "鍝侀」鏁�")
     @TableField("item_num")
     private String itemNum;
 
@@ -177,7 +178,7 @@
      * 瀹夊叏搴撳瓨閲�
      */
     @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
-    @ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
+//    @ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
     @TableField("safe_qty")
     private Double safeQty;
 
@@ -204,14 +205,14 @@
      * 浣撶Н
      */
     @ApiModelProperty(value= "浣撶Н")
-    @ExcelProperty(value = "浣撶Н")
+//    @ExcelProperty(value = "浣撶Н")
     private Double volume;
 
     /**
      * 涓夋柟缂栫爜
      */
     @ApiModelProperty(value= "涓夋柟缂栫爜")
-    @ExcelProperty(value = "涓夋柟缂栫爜")
+    @ExcelProperty(value = "BS Code")
     @TableField("three_code")
     private String threeCode;
 
@@ -219,7 +220,7 @@
      * 渚涘簲鍟�
      */
     @ApiModelProperty(value= "渚涘簲鍟�")
-    @ExcelProperty(value = "渚涘簲鍟�")
+//    @ExcelProperty(value = "渚涘簲鍟�")
     private String supp;
 
     /**
@@ -242,7 +243,7 @@
      */
     @ApiModelProperty(value= "淇濊川鏈�")
     @TableField("dead_time")
-    @ExcelProperty(value = "淇濊川鏈�")
+//    @ExcelProperty(value = "淇濊川鏈�")
     private String deadTime;
 
     /**
@@ -250,7 +251,7 @@
      */
     @ApiModelProperty(value= "棰勮澶╂暟")
     @TableField("dead_warn")
-    @ExcelProperty(value = "棰勮澶╂暟")
+//    @ExcelProperty(value = "棰勮澶╂暟")
     private Integer deadWarn;
 
     /**
@@ -310,7 +311,7 @@
 
     @ApiModelProperty("搴撲綅绫诲瀷")
     @TableField("loc_type")
-    @ExcelProperty(value = "搴撲綅绫诲瀷")
+//    @ExcelProperty(value = "搴撲綅绫诲瀷")
     private Long locType;
 
     /**
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 7d39dc0..23276e6 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -255,7 +255,6 @@
             ReportOrderParam orderParam = new ReportOrderParam();
             orderParam.setCompany_id(order.getCstmrName())
                     .setWms_id(order.getId() + "")
-//                    .setOrder_no(order.getOrderNo())
                     .setDispatch_no(order.getOrderNo())
                     .setType(order.getDocType() + "")
                     .setInv_no(order.getNumber())
@@ -349,47 +348,36 @@
             ReportOrderParam orderParam = new ReportOrderParam();
             orderParam.setCompany_id(order.getCstmrName())
                     .setWms_id(order.getId() + "")
-                    .setOrder_no(order.getOrderNo())
+                    .setDispatch_no(order.getOrderNo())
                     .setType(order.getDocType() + "")
-                    .setInv_no(order.getNumber())
-                    .setPm_tktid(order.getItemName())
                     .setUpdate_time(Utils.dateToStr(new Date(), "yyyy-MM-dd HH:mm:ss"))
+                    //鐩爣搴撳尯
+                    .setTarget_location("")
                     .setTarget_location("1");
 
-            List<ReportOrderParams> reportOrderParams = new ArrayList<>();
+            List<OrderItemsParam> reportOrderParams = new ArrayList<>();
             orderDetls.forEach(detl -> {
                 Mat material = matService.selectByMatnr(detl.getMatnr());
                 if (Objects.isNull(material)) {
                     throw new CoolException("鐗╂枡涓嶅瓨鍦�");
                 }
-                ReportOrderParams itemParam = new ReportOrderParams();
+                OrderItemsParam itemParam = new OrderItemsParam();
                 // BS Code
-                itemParam.setTotal_serial(detl.getThreeCode())
+                itemParam
                         // 涓婃姤鏃讹紝榛樿浜у搧绫诲瀷鏄痭ull
                         .setPro_type(material.getProType())
                         // 涓婃姤鏃讹紝榛樿浜у搧缂栫爜
                         .setPro_komcode(detl.getMatnr())
                         // 涓婃姤鏃讹紝榛樿浜у搧id鏄緵搴斿晢缂栫爜
                         .setPro_id(detl.getSuppCode())
-                        // 涓婃姤鏃讹紝榛樿鏉ユ簮浣嶇疆鏄痭ull
+//                        // 涓婃姤鏃讹紝榛樿鏉ユ簮浣嶇疆鏄痭ull
                         .setLocation_no(null)
-                        // 涓婃姤鏃讹紝榛樿鐩爣浣嶇疆鏄痭ull
-                        .setLocation_type(null)
-                        // 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
-                        .setSj_date(order.getUpdateTime$())
-                        // 涓婃姤鏃讹紝榛樿涓婃姤浜烘槸鏇存柊浜�
-                        .setSj_emp(order.getUpdateBy$())
                         // 涓婃姤鏃讹紝榛樿涓婃姤鏁伴噺鏄鍗曟暟閲�
-                        .setPick_qty(detl.getQty().intValue())
-                        // 涓婃姤鏃讹紝榛樿鎹熷潖鏁伴噺鏄�0
-                        .setDamage_qty(0)
-                        // 涓婃姤鏃讹紝榛樿宸紓鏁伴噺鏄�0
-                        .setDiff_qty(0);
-
+                        .setPick_qty(detl.getQty().intValue());
                 reportOrderParams.add(itemParam);
             });
 
-            orderParam.setDetails(reportOrderParams);
+            orderParam.setPartList(reportOrderParams);
 
             XSR response = null;
             boolean success = false;
@@ -413,18 +401,6 @@
                             JSON.toJSONString(orderParams), JSON.toJSONString(response));
                     throw new CoolException("涓婃姤KOPEN绯荤粺澶辫触");
                 }
-//                if (true) {
-//                    success = true;
-//                    // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-//                    if (!orderService.updateSettle(order.getId(), settle, null)) {
-//                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-//                    }
-//                } else {
-//                    log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}",
-//                            MesConstant.URL + MesConstant.OUT_DISPATCH_RESULT,
-//                            JSON.toJSONString(orderParam), JSON.toJSONString(response));
-//                    throw new CoolException("涓婃姤KOPEN绯荤粺澶辫触");
-//                }
             } catch (Exception e) {
                 log.error("fail", e);
                 return FAIL.setMsg(e.getMessage());
diff --git a/src/main/java/com/zy/asrs/utils/MatExcelListener.java b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
index 7e53bac..27b3cef 100644
--- a/src/main/java/com/zy/asrs/utils/MatExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
@@ -61,7 +61,7 @@
         Long tagId;
         // 鍒嗙被
         // 涓�绾у垎绫�
-        if (!Cools.isEmpty(excel.getPriClass()) && !Cools.isEmpty(excel.getSecClass())) {
+        if (!Cools.isEmpty(excel.getPriClass())) {
             Tag priTag = tagService.selectByName(excel.getPriClass(), 2);
             if (priTag == null) {
                 Tag top = tagService.getTop();
@@ -92,38 +92,40 @@
                     throw new CoolException("淇濆瓨涓�绾у垎绫诲け璐�");
                 }
             }
-            // 浜岀骇鍒嗙被
-            Tag secTag = tagService.selectByName(excel.getSecClass(), 3);
-            if (secTag == null) {
-                NodeUtils nodeUtils = new NodeUtils();
-                nodeUtils.executePath(priTag.getId());
-                secTag = new Tag(
-                        null,    // 缂栧彿
-                        excel.getSecClass(),    // 鍚嶇О
-                        priTag.getId(),    // 鐖剁骇
-                        priTag.getName(),    // 鐖剁骇鍚嶇О
-                        nodeUtils.path.toString(),    // 鍏宠仈璺緞
-                        nodeUtils.pathName.toString(),    // 鍏宠仈璺緞鍚�
-                        0,    // 绫诲瀷
-                        null,    // 璐熻矗浜�
-                        null,    // 鍥剧墖
-                        null,    // 绠�瑕佹弿杩�
-                        null,    // 鏁伴噺
-                        3,    // 绛夌骇
-                        null,    // 鎺掑簭
-                        1,    // 鐘舵��
-                        now,    // 娣诲姞鏃堕棿
-                        null,    // 娣诲姞浜哄憳
-                        now,    // 淇敼鏃堕棿
-                        null,    // 淇敼浜哄憳
-                        null    // 澶囨敞
-                );
-                if (tagMapper.insert(secTag) == 0) {
-                    throw new CoolException("淇濆瓨浜岀骇鍒嗙被澶辫触");
-                }
-            }
-            tagId = secTag.getId();
-        } else {
+//            // 浜岀骇鍒嗙被
+//            Tag secTag = tagService.selectByName(excel.getSecClass(), 3);
+//            if (secTag == null) {
+//                NodeUtils nodeUtils = new NodeUtils();
+//                nodeUtils.executePath(priTag.getId());
+//                secTag = new Tag(
+//                        null,    // 缂栧彿
+//                        excel.getSecClass(),    // 鍚嶇О
+//                        priTag.getId(),    // 鐖剁骇
+//                        priTag.getName(),    // 鐖剁骇鍚嶇О
+//                        nodeUtils.path.toString(),    // 鍏宠仈璺緞
+//                        nodeUtils.pathName.toString(),    // 鍏宠仈璺緞鍚�
+//                        0,    // 绫诲瀷
+//                        null,    // 璐熻矗浜�
+//                        null,    // 鍥剧墖
+//                        null,    // 绠�瑕佹弿杩�
+//                        null,    // 鏁伴噺
+//                        3,    // 绛夌骇
+//                        null,    // 鎺掑簭
+//                        1,    // 鐘舵��
+//                        now,    // 娣诲姞鏃堕棿
+//                        null,    // 娣诲姞浜哄憳
+//                        now,    // 淇敼鏃堕棿
+//                        null,    // 淇敼浜哄憳
+//                        null    // 澶囨敞
+//                );
+//                if (tagMapper.insert(secTag) == 0) {
+//                    throw new CoolException("淇濆瓨浜岀骇鍒嗙被澶辫触");
+//                }
+//            }
+            tagId = priTag.getId();
+        }
+
+        else {
             tagId = tagService.getTop().getId();
         }
         // 鍟嗗搧
diff --git a/src/main/java/com/zy/common/entity/MatExcel.java b/src/main/java/com/zy/common/entity/MatExcel.java
index 640c0de..02c9403 100644
--- a/src/main/java/com/zy/common/entity/MatExcel.java
+++ b/src/main/java/com/zy/common/entity/MatExcel.java
@@ -14,10 +14,10 @@
 @ExcelIgnoreUnannotated
 public class MatExcel extends Mat {
 
-    @ExcelProperty(index = 0, value = "涓�绾у垎绫�")
+    @ExcelProperty(index = 0, value = "鍟嗗搧鍒嗙被")
     private String priClass;
 
-    @ExcelProperty(index = 1, value = "浜岀骇鍒嗙被")
-    private String secClass;
+//    @ExcelProperty(index = 1, value = "浜岀骇鍒嗙被")
+//    private String secClass;
 
 }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 665bb87..924e229 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -12,7 +12,7 @@
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
     username: sa
     password: sa@123
-    url: jdbc:sqlserver://172.24.103.147:1433;databasename=jsxsasrs
+    url: jdbc:sqlserver://47.97.1.152:1433;databasename=jsxsasrs
   mvc:
     static-path-pattern: /**
   redis:
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 1770a64..176201a 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -191,13 +191,13 @@
     ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
     ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
     ,{field: 'upQty', align: 'center',title: '缁勬墭涓婇檺'}
+    ,{field: 'manu', align: 'center',title: '鍏徃', hide: false}
     ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
     ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
     ,{field: 'sku', align: 'center',title: 'sku', hide: true}
     ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
     ,{field: 'barcode', align: 'center',title: '鏉$爜', hide: true}
     ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
-    ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
     ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
     ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
     ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index 4874d47..20381fd 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -301,11 +301,11 @@
                 // 鍥炴樉琛ㄥ崟鏁版嵁
                 form.val('detail', mData);
                 // 鏂板鑷姩鐢熸垚鍟嗗搧缂栧彿
-                if (!mData) {
-                    http.get(baseUrl + "/mat/auto/matnr/auth", null, function (res) {
-                        $('#matnr').val(res.data);
-                    })
-                }
+                // if (!mData) {
+                //     http.get(baseUrl + "/mat/auto/matnr/auth", null, function (res) {
+                //         $('#matnr').val(res.data);
+                //     })
+                // }
                 // 琛ㄥ崟鎻愪氦浜嬩欢
                 form.on('submit(editSubmit)', function (data) {
                     data.field.tagId = insXmSel.getValue('valueStr');
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index afc425b..ce88808 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -184,7 +184,7 @@
         <div class="layui-row">
             <div class="layui-col-md6">
                 <div class="layui-form-item">
-                    <label class="layui-form-label">鍒嗙被</label>
+                    <label class="layui-form-label">闆朵欢绫诲瀷</label>
                     <div class="layui-input-block">
                         <div id="tagSel" class="ew-xmselect-tree"></div>
                     </div>
@@ -202,23 +202,17 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">閰嶇疆</label>
+                    <label class="layui-form-label">灏哄</label>
                     <div class="layui-input-block">
-                        <input name="specs" placeholder="璇疯緭鍏ラ厤缃�" class="layui-input">
+                        <input name="specs" placeholder="璇疯緭鍏ュ昂瀵�" class="layui-input">
                     </div>
                 </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">鍗曠鍑�閲�</label>
-                    <div class="layui-input-block">
-                        <input name="weight" placeholder="璇疯緭鍏ュ崟绠卞噣閲嶆牸" class="layui-input">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">鍗曠浣撶Н</label>
-                    <div class="layui-input-block">
-                        <input name="volume" placeholder="璇疯緭鍏ュ崟绠变綋绉�" class="layui-input">
-                    </div>
-                </div>
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label">灏哄</label>-->
+<!--                    <div class="layui-input-block">-->
+<!--                        <input name="volume" placeholder="璇疯緭灏哄" class="layui-input">-->
+<!--                    </div>-->
+<!--                </div>-->
             </div>
             <div class="layui-col-md6">
                 <div class="layui-form-item">
@@ -228,29 +222,29 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">瑙勬牸</label>
+                    <label class="layui-form-label layui-form-required">渚涘簲鍟�</label>
                     <div class="layui-input-block">
-                        <input name="specs" placeholder="璇疯緭鍏ヤ唬鐮�" class="layui-input">
+                        <input name="suppCode" placeholder="璇疯緭鍏ヤ緵搴斿晢缂栫爜" class="layui-input" lay-verify="required">
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">澶囨敞</label>
+                    <label class="layui-form-label">鍏徃淇℃伅</label>
                     <div class="layui-input-block">
-                        <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
+                        <input name="manu" placeholder="璇疯緭鍏ュ叕鍙镐俊鎭�" class="layui-input" >
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">鍗曠姣涢噸</label>
+                    <label class="layui-form-label">閲嶉噺</label>
                     <div class="layui-input-block">
-                        <input name="manLength" placeholder="璇疯緭鍏ュ崟绠辨瘺閲�" class="layui-input">
+                        <input name="weight" placeholder="璇疯緭鍏ラ噸閲�" class="layui-input">
                     </div>
                 </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">鍗曠浣撶Н</label>
-                    <div class="layui-input-block">
-                        <input name="threeCode" placeholder="璇疯緭鍏ョ瀛愬昂瀵�" class="layui-input">
-                    </div>
-                </div>
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label">鍗曠浣撶Н</label>-->
+<!--                    <div class="layui-input-block">-->
+<!--                        <input name="threeCode" placeholder="璇疯緭鍏ョ瀛愬昂瀵�" class="layui-input">-->
+<!--                    </div>-->
+<!--                </div>-->
             </div>
         </div>
         <hr class="layui-bg-gray">

--
Gitblit v1.9.1