From af8a669a028838d4896eb4167a6895551938dd29 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 19 一月 2026 15:06:52 +0800
Subject: [PATCH] 备货指示派工单反馈优化

---
 src/main/java/com/zy/asrs/entity/TaskDetlLog.java            |  216 +++++++++++++++++++++++++++---------------
 src/main/webapp/views/mat/mat.html                           |   30 +++---
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   30 +++++-
 src/main/webapp/views/locCache/locCache.html                 |    3 
 src/main/java/com/zy/asrs/controller/MatController.java      |    4 
 5 files changed, 183 insertions(+), 100 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index f387127..bc3a2c2 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -188,7 +188,9 @@
             if (pakinCount > 0 || wrkCount > 0 || taskCount > 0) {
                 throw new CoolException(entity.getMatnr() + "鍦ㄤ綔涓氭竻鍗曚腑锛屾棤娉曟墽琛屽垹闄ゆ搷浣滐紒锛�");
             }
-            if (!matService.delete(new EntityWrapper<>(entity))) {
+            if (!matService.delete(new EntityWrapper<Mat>()
+                    .eq("matnr", entity.getMatnr())
+                    .eq("supp_code", entity.getSuppCode()))) {
                 throw new CoolException("鍒犻櫎澶辫触锛岃鑱旂郴绠＄悊鍛�");
             }
         }
diff --git a/src/main/java/com/zy/asrs/entity/TaskDetlLog.java b/src/main/java/com/zy/asrs/entity/TaskDetlLog.java
index bf7ecb5..dea21db 100644
--- a/src/main/java/com/zy/asrs/entity/TaskDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskDetlLog.java
@@ -2,25 +2,37 @@
 
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.baomidou.mybatisplus.annotations.TableField;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
+
+import com.zy.asrs.service.BasAreasService;
+import com.zy.asrs.service.LocCacheService;
+import com.zy.asrs.service.TaskLogService;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.core.common.SpringUtils;
 import com.zy.system.service.UserService;
 import com.zy.system.entity.User;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
+
 import com.core.common.SpringUtils;
 import com.zy.system.service.UserService;
 import com.zy.system.entity.User;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotations.TableName;
+
 import java.io.Serializable;
+import java.util.Objects;
 
 @Data
 @TableName("agv_task_detl_log")
@@ -37,284 +49,285 @@
     /**
      * 宸ヤ綔鍙�
      */
-    @ApiModelProperty(value= "宸ヤ綔鍙�")
+    @ApiModelProperty(value = "宸ヤ綔鍙�")
     @TableField("wrk_no")
     private Integer wrkNo;
 
     /**
      * 宸ヤ綔鏃堕棿
      */
-    @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+    @ApiModelProperty(value = "宸ヤ綔鏃堕棿")
     @TableField("io_time")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date ioTime;
 
     /**
      * 鏁伴噺
      */
-    @ApiModelProperty(value= "鏁伴噺")
+    @ApiModelProperty(value = "鏁伴噺")
     private Double anfme;
 
     /**
      * 鎵樼洏鏉＄爜
      */
-    @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+    @ApiModelProperty(value = "鎵樼洏鏉＄爜")
     private String zpallet;
 
     /**
      * 鍟嗗搧缂栧彿
      */
-    @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+    @ApiModelProperty(value = "鍟嗗搧缂栧彿")
     private String matnr;
 
     /**
      * 鍟嗗搧鍚嶇О
      */
-    @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+    @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
     private String maktx;
 
     /**
      * 鎵瑰彿
      */
-    @ApiModelProperty(value= "鎵瑰彿")
+    @ApiModelProperty(value = "鎵瑰彿")
     private String batch;
 
     /**
      * 鍗曟嵁缂栧彿
      */
-    @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+    @ApiModelProperty(value = "鍗曟嵁缂栧彿")
     @TableField("order_no")
     private String orderNo;
 
     /**
      * 瑙勬牸
      */
-    @ApiModelProperty(value= "瑙勬牸")
+    @ApiModelProperty(value = "瑙勬牸")
     private String specs;
 
     /**
      * 鍨嬪彿
      */
-    @ApiModelProperty(value= "鍨嬪彿")
+    @ApiModelProperty(value = "鍨嬪彿")
     private String model;
 
     /**
      * 棰滆壊
      */
-    @ApiModelProperty(value= "棰滆壊")
+    @ApiModelProperty(value = "棰滆壊")
     private String color;
 
     /**
      * 鍝佺墝
      */
-    @ApiModelProperty(value= "鍝佺墝")
+    @ApiModelProperty(value = "鍝佺墝")
     private String brand;
 
     /**
      * 鍗曚綅
      */
-    @ApiModelProperty(value= "鍗曚綅")
+    @ApiModelProperty(value = "鍗曚綅")
     private String unit;
 
     /**
      * 鍗曚环
      */
-    @ApiModelProperty(value= "鍗曚环")
+    @ApiModelProperty(value = "鍗曚环")
     private Double price;
 
     /**
      * sku
      */
-    @ApiModelProperty(value= "sku")
+    @ApiModelProperty(value = "sku")
     private String sku;
 
     /**
      * 鍗曚綅閲�
      */
-    @ApiModelProperty(value= "鍗曚綅閲�")
+    @ApiModelProperty(value = "鍗曚綅閲�")
     private Double units;
 
     /**
      * 鏉＄爜
      */
-    @ApiModelProperty(value= "鏉＄爜")
+    @ApiModelProperty(value = "鏉＄爜")
     private String barcode;
 
     /**
      * 浜у湴
      */
-    @ApiModelProperty(value= "浜у湴")
+    @ApiModelProperty(value = "浜у湴")
     private String origin;
 
     /**
      * 鍘傚
      */
-    @ApiModelProperty(value= "鍘傚")
+    @ApiModelProperty(value = "鍘傚")
     private String manu;
 
     /**
      * 鐢熶骇鏃ユ湡
      */
-    @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+    @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
     @TableField("manu_date")
     private String manuDate;
 
     /**
      * 鍝侀」鏁�
      */
-    @ApiModelProperty(value= "鍝侀」鏁�")
+    @ApiModelProperty(value = "鍝侀」鏁�")
     @TableField("item_num")
     private String itemNum;
 
     /**
      * 瀹夊叏搴撳瓨閲�
      */
-    @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+    @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
     @TableField("safe_qty")
     private Double safeQty;
 
     /**
      * 閲嶉噺
      */
-    @ApiModelProperty(value= "閲嶉噺")
+    @ApiModelProperty(value = "閲嶉噺")
     private Double weight;
 
     /**
      * 闀垮害
      */
-    @ApiModelProperty(value= "闀垮害")
+    @ApiModelProperty(value = "闀垮害")
     @TableField("man_length")
     private Double manLength;
 
     /**
      * 浣撶Н
      */
-    @ApiModelProperty(value= "浣撶Н")
+    @ApiModelProperty(value = "浣撶Н")
     private Double volume;
 
     /**
      * 涓夋柟缂栫爜
      */
-    @ApiModelProperty(value= "涓夋柟缂栫爜")
+    @ApiModelProperty(value = "涓夋柟缂栫爜")
     @TableField("three_code")
     private String threeCode;
 
     /**
      * 渚涘簲鍟�
      */
-    @ApiModelProperty(value= "渚涘簲鍟�")
+    @ApiModelProperty(value = "渚涘簲鍟�")
     private String supp;
 
     /**
      * 渚涘簲鍟嗙紪鐮�
      */
-    @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+    @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
     @TableField("supp_code")
     private String suppCode;
 
     /**
-     * 鏄惁鎵规 1: 鏄�  0: 鍚�  
+     * 鏄惁鎵规 1: 鏄�  0: 鍚�
      */
-    @ApiModelProperty(value= "鏄惁鎵规 1: 鏄�  0: 鍚�  ")
+    @ApiModelProperty(value = "鏄惁鎵规 1: 鏄�  0: 鍚�  ")
     @TableField("be_batch")
     private Integer beBatch;
 
     /**
      * 淇濊川鏈�
      */
-    @ApiModelProperty(value= "淇濊川鏈�")
+    @ApiModelProperty(value = "淇濊川鏈�")
     @TableField("dead_time")
     private String deadTime;
 
     /**
      * 棰勮澶╂暟
      */
-    @ApiModelProperty(value= "棰勮澶╂暟")
+    @ApiModelProperty(value = "棰勮澶╂暟")
     @TableField("dead_warn")
     private Integer deadWarn;
 
     /**
-     * 鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗  
+     * 鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗
      */
-    @ApiModelProperty(value= "鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗  ")
+    @ApiModelProperty(value = "鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗  ")
     private Integer source;
 
     /**
-     * 瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  
+     * 瑕佹眰妫�楠� 1: 鏄�  0: 鍚�
      */
-    @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
+    @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
     private Integer inspect;
 
     /**
-     * 鍗遍櫓鍝� 1: 鏄�  0: 鍚�  
+     * 鍗遍櫓鍝� 1: 鏄�  0: 鍚�
      */
-    @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄�  0: 鍚�  ")
+    @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄�  0: 鍚�  ")
     private Integer danger;
 
     /**
      * 淇敼浜哄憳
      */
-    @ApiModelProperty(value= "淇敼浜哄憳")
+    @ApiModelProperty(value = "淇敼浜哄憳")
     @TableField("modi_user")
     private Long modiUser;
 
     /**
      * 淇敼鏃堕棿
      */
-    @ApiModelProperty(value= "淇敼鏃堕棿")
+    @ApiModelProperty(value = "淇敼鏃堕棿")
     @TableField("modi_time")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date modiTime;
 
     /**
      * 娣诲姞浜哄憳
      */
-    @ApiModelProperty(value= "娣诲姞浜哄憳")
+    @ApiModelProperty(value = "娣诲姞浜哄憳")
     @TableField("appe_user")
     private Long appeUser;
 
     /**
      * 娣诲姞鏃堕棿
      */
-    @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @ApiModelProperty(value = "娣诲姞鏃堕棿")
     @TableField("appe_time")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date appeTime;
 
     /**
      * 澶囨敞
      */
-    @ApiModelProperty(value= "澶囨敞")
+    @ApiModelProperty(value = "澶囨敞")
     private String memo;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value = "")
     @TableField("line_number")
     private Long lineNumber;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value = "")
     private String standby1;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value = "")
     private String standby2;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value = "")
     private String standby3;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value = "")
     @TableField("box_type1")
     private String boxType1;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value = "")
     @TableField("box_type2")
     private String boxType2;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value = "")
     @TableField("box_type3")
     private String boxType3;
 
-    public TaskDetlLog() {}
+    public TaskDetlLog() {
+    }
 
-    public TaskDetlLog(Integer wrkNo,Date ioTime,Double anfme,String zpallet,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double manLength,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long lineNumber,String standby1,String standby2,String standby3,String boxType1,String boxType2,String boxType3) {
+    public TaskDetlLog(Integer wrkNo, Date ioTime, Double anfme, String zpallet, String matnr, String maktx, String batch, String orderNo, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Long modiUser, Date modiTime, Long appeUser, Date appeTime, String memo, Long lineNumber, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
         this.wrkNo = wrkNo;
         this.ioTime = ioTime;
         this.anfme = anfme;
@@ -412,16 +425,18 @@
 //            null    // 
 //    );
 
-    public String getIoTime$(){
-        if (Cools.isEmpty(this.ioTime)){
+    public String getIoTime$() {
+        if (Cools.isEmpty(this.ioTime)) {
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
     }
 
-    public String getBeBatch$(){
-        if (null == this.beBatch){ return null; }
-        switch (this.beBatch){
+    public String getBeBatch$() {
+        if (null == this.beBatch) {
+            return null;
+        }
+        switch (this.beBatch) {
             case 1:
                 return "鏄�";
             case 0:
@@ -431,9 +446,11 @@
         }
     }
 
-    public String getSource$(){
-        if (null == this.source){ return null; }
-        switch (this.source){
+    public String getSource$() {
+        if (null == this.source) {
+            return null;
+        }
+        switch (this.source) {
             case 1:
                 return "鍒堕��";
             case 2:
@@ -445,9 +462,11 @@
         }
     }
 
-    public String getInspect$(){
-        if (null == this.inspect){ return null; }
-        switch (this.inspect){
+    public String getInspect$() {
+        if (null == this.inspect) {
+            return null;
+        }
+        switch (this.inspect) {
             case 1:
                 return "鏄�";
             case 0:
@@ -457,9 +476,11 @@
         }
     }
 
-    public String getDanger$(){
-        if (null == this.danger){ return null; }
-        switch (this.danger){
+    public String getDanger$() {
+        if (null == this.danger) {
+            return null;
+        }
+        switch (this.danger) {
             case 1:
                 return "鏄�";
             case 0:
@@ -469,33 +490,72 @@
         }
     }
 
-    public String getModiUser$(){
+
+    /**
+     * 鑾峰彇搴撳尯绫诲瀷
+     *
+     * @return java.lang.String
+     * @author Ryan
+     * @date 2026/1/19 14:07
+     */
+    public String getAreaType() {
+        if (null == this.wrkNo) {
+            return null;
+        }
+        TaskLogService taskLogService = SpringUtils.getBean(TaskLogService.class);
+        TaskLog taskLog = taskLogService.selectOne(new EntityWrapper<TaskLog>().eq("wrk_no", this.wrkNo));
+        if (Objects.isNull(taskLog)) {
+            return null;
+        }
+        LocCacheService locCacheService = SpringUtils.getBean(LocCacheService.class);
+        LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", taskLog.getLocNo()));
+        if (Objects.isNull(locCache)) {
+            return null;
+        }
+        BasAreasService basAreasService = SpringUtils.getBean(BasAreasService.class);
+        BasAreas basAreas = basAreasService.selectById(locCache.getAreaId());
+        if (Objects.isNull(basAreas)) {
+            return null;
+        }
+        if (basAreas.getAreaNo().equals("SO")) {
+            return "2";
+        } else if (basAreas.getAreaNo().equals("EO")) {
+            return "3";
+        } else if (basAreas.getAreaNo().equals("LK")) {
+            return "1";
+        } else {
+            return "4";
+        }
+    }
+
+
+    public String getModiUser$() {
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.modiUser);
-        if (!Cools.isEmpty(user)){
+        if (!Cools.isEmpty(user)) {
             return String.valueOf(user.getNickname());
         }
         return null;
     }
 
-    public String getModiTime$(){
-        if (Cools.isEmpty(this.modiTime)){
+    public String getModiTime$() {
+        if (Cools.isEmpty(this.modiTime)) {
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
     }
 
-    public String getAppeUser$(){
+    public String getAppeUser$() {
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.appeUser);
-        if (!Cools.isEmpty(user)){
+        if (!Cools.isEmpty(user)) {
             return String.valueOf(user.getNickname());
         }
         return null;
     }
 
-    public String getAppeTime$(){
-        if (Cools.isEmpty(this.appeTime)){
+    public String getAppeTime$() {
+        if (Cools.isEmpty(this.appeTime)) {
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
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 23276e6..047bb09 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -19,6 +19,8 @@
 import com.zy.asrs.entity.*;
 import com.zy.asrs.enums.OrderTypeEnum;
 import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.TaskDetlLogServiceImpl;
+import com.zy.asrs.service.impl.TaskDetlServiceImpl;
 import com.zy.asrs.task.AbstractHandler;
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.asrs.utils.OrderInAndOutUtil;
@@ -69,6 +71,8 @@
     private LocDetlService locDetlService;
     @Autowired
     CheckOrderDetlService checkOrderDetlService;
+    @Autowired
+    private TaskDetlLogService taskDetlLogService;
 
 
     @Transactional
@@ -288,9 +292,9 @@
                         .setPro_id(detl.getSuppCode())
                         .setLocation_no(locDetl.getZpallet())
                         .setSj_emp(locDetl.getModiUser$())
-                        .setLocation_type(MatLocType.getMatTag(material.getTagId()  + ""))
+                        .setLocation_type(MatLocType.getMatTag(material.getTagId() + ""))
                         // 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
-                        .setSj_date(Utils.dateToStr(order.getUpdateTime(), "yyyy-MM-dd HH:mm:ss") )
+                        .setSj_date(Utils.dateToStr(order.getUpdateTime(), "yyyy-MM-dd HH:mm:ss"))
                         // 涓婃姤鏃讹紝榛樿涓婃姤鏁伴噺鏄鍗曟暟閲�
                         .setPick_qty(detl.getQty().intValue())
                         // 涓婃姤鏃讹紝榛樿鎹熷潖鏁伴噺鏄�0
@@ -361,6 +365,15 @@
                 if (Objects.isNull(material)) {
                     throw new CoolException("鐗╂枡涓嶅瓨鍦�");
                 }
+                TaskDetlLog detlLog = taskDetlLogService.selectOne(new EntityWrapper<TaskDetlLog>()
+                        .eq("matnr", detl.getMatnr())
+                        .eq("supp_code", detl.getStandby1())
+                        .eq("order_no", detl.getOrderNo()));
+                if (Objects.isNull(detlLog)) {
+                    throw new CoolException("鏁版嵁閿欒 锛岃妫�鏌GV浠诲姟妗ｆ槸鍚﹀凡瀹屾垚锛侊紒");
+                }
+                //鐩爣搴撳尯
+                orderParam.setTarget_location(detlLog.getAreaType());
                 OrderItemsParam itemParam = new OrderItemsParam();
                 // BS Code
                 itemParam
@@ -371,12 +384,19 @@
                         // 涓婃姤鏃讹紝榛樿浜у搧id鏄緵搴斿晢缂栫爜
                         .setPro_id(detl.getSuppCode())
 //                        // 涓婃姤鏃讹紝榛樿鏉ユ簮浣嶇疆鏄痭ull
-                        .setLocation_no(null)
+                        .setLocation_no(detlLog.getZpallet())
                         // 涓婃姤鏃讹紝榛樿涓婃姤鏁伴噺鏄鍗曟暟閲�
                         .setPick_qty(detl.getQty().intValue());
                 reportOrderParams.add(itemParam);
             });
 
+            if (orderParam.getTarget_location().equals("2")) {
+                orderParam.setType("11");
+            } else if (orderParam.getTarget_location().equals("3")) {
+                orderParam.setType("12");
+            } else {
+                orderParam.setType("13");
+            }
             orderParam.setPartList(reportOrderParams);
 
             XSR response = null;
@@ -516,7 +536,7 @@
 
     /**
      * 鎹熸孩鍗曞畬缁撲笂鎶�
-     * 
+     *
      * @param order
      * @return
      */
@@ -562,7 +582,7 @@
             if (response.getSuccess()) {
                 return SUCCESS;
             } else {
-                return  FAIL;
+                return FAIL;
             }
         }
 
diff --git a/src/main/webapp/views/locCache/locCache.html b/src/main/webapp/views/locCache/locCache.html
index 5d019ad..c76f356 100644
--- a/src/main/webapp/views/locCache/locCache.html
+++ b/src/main/webapp/views/locCache/locCache.html
@@ -33,7 +33,8 @@
                             <select name="area_name">
                                 <option value="">搴撳尯鍚嶇О</option>
                                 <option value="鍏ュ簱鍖�">鍏ュ簱鍖�</option>
-                                <option value="闆嗚揣鍖�">闆嗚揣鍖�</option>
+                                <option value="SO">SO搴撳尯</option>
+                                <option value="EO">EO搴撳尯</option>
                             </select>
                         </div>
                     </div>
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index ce88808..af62c8c 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -98,9 +98,9 @@
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍟嗗搧瑙勬牸:</label>
+                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">渚涘簲鍟�:</label>
                             <div class="layui-input-inline">
-                                <input name="specs" class="layui-input" placeholder="杈撳叆鍟嗗搧瑙勬牸"/>
+                                <input name="suppCode" class="layui-input" placeholder="杈撳叆鍟嗗搧瑙勬牸"/>
                             </div>
                         </div>
                         <div class="layui-inline">&emsp;
@@ -130,19 +130,19 @@
         <button class="layui-btn layui-btn-sm" id="btn-batch-update" lay-event="batchModifties">鎵归噺淇敼</button>
         <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
         <!-- 鍟嗗搧/鐗╂枡 鏁版嵁涓績 -->
-        <div class="dropdown-menu" style="float: right">
-            <button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm">&nbsp;鏁版嵁鍚屾 <i class="layui-icon layui-icon-drop"></i></button>
-            <ul class="dropdown-menu-nav dark">
-                <div class="dropdown-anchor"></div>
-                <li class="title">1st menu</li>
-                <li><a onclick="excelMouldDownload()" style="font-size: 12px"><i class="layui-icon layui-icon-template-1"></i>妯℃澘涓嬭浇</a></li>
-                <li><a onclick="importExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-upload"></i>瀵煎叆 Excel</a></li>
-                <li style="display: none"><input id="importExcel" type="file" onchange="upload(this)" ></li>
-                <hr>
-                <li class="title">2nd menu</li>
-                <li><a onclick="exportExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-export"></i>瀵煎嚭 Excel</a></li>
-            </ul>
-        </div>
+<!--        <div class="dropdown-menu" style="float: right">-->
+<!--            <button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm">&nbsp;鏁版嵁鍚屾 <i class="layui-icon layui-icon-drop"></i></button>-->
+<!--            <ul class="dropdown-menu-nav dark">-->
+<!--                <div class="dropdown-anchor"></div>-->
+<!--                <li class="title">1st menu</li>-->
+<!--                <li><a onclick="excelMouldDownload()" style="font-size: 12px"><i class="layui-icon layui-icon-template-1"></i>妯℃澘涓嬭浇</a></li>-->
+<!--                <li><a onclick="importExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-upload"></i>瀵煎叆 Excel</a></li>-->
+<!--                <li style="display: none"><input id="importExcel" type="file" onchange="upload(this)" ></li>-->
+<!--                <hr>-->
+<!--                <li class="title">2nd menu</li>-->
+<!--                <li><a onclick="exportExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-export"></i>瀵煎嚭 Excel</a></li>-->
+<!--            </ul>-->
+<!--        </div>-->
 <!--        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right;margin-right: -10px">瀵煎嚭</button>-->
     </div>
 </script>

--
Gitblit v1.9.1