From d14030746fcd0310d3c9b028fe2c0a5b78984eb6 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 21 四月 2026 19:44:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan into dev

---
 Code/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue              |    8 
 Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/WareHouseEnum/WarehouseEnum.cs |    8 
 Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs            |    9 +
 Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx             |   84 ++++++---
 Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue                 |   11 +
 Code/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.jsx               |  168 ++++++++++--------
 Code/WMS/WIDESEA_WMSClient/src/views/stock/groupPalle.vue                |   11 +
 Code/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.jsx               |  193 ++++++++++++---------
 Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/HtmlElementType.cs         |    3 
 Code/WMS/WIDESEA_WMSClient/src/extension/stock/stock.jsx                 |   10 +
 Code/WMS/WIDESEA_WMSClient/src/extension/taskinfo/agvTask.jsx            |    4 
 Code/WMS/WIDESEA_WMSClient/src/extension/stock/groupPalle.jsx            |    4 
 12 files changed, 314 insertions(+), 199 deletions(-)

diff --git a/Code/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.jsx b/Code/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.jsx
index 8a02afb..ad1b3a1 100644
--- a/Code/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.jsx
+++ b/Code/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.jsx
@@ -1,82 +1,100 @@
-
 //姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-import gridBody from './extend/taskExecuteDetail.vue'
+import gridBody from "./extend/taskExecuteDetail.vue";
 let extension = {
-    components: {
-        //鏌ヨ鐣岄潰鎵╁睍缁勪欢
-        gridHeader: '',
-        gridBody: gridBody,
-        gridFooter: '',
-        //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
-        modelHeader: '',
-        modelBody: '',
-        modelFooter: ''
+  components: {
+    //鏌ヨ鐣岄潰鎵╁睍缁勪欢
+    gridHeader: "",
+    gridBody: gridBody,
+    gridFooter: "",
+    //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
+    modelHeader: "",
+    modelBody: "",
+    modelFooter: "",
+  },
+  tableAction: "", //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+  buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
+  methods: {
+    //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
+    onInit() {
+      // this.$Notice.success({ title: this.detailOptions.cnName + ',鏌ヨ缁撴灉', desc: '杩斿洖鐨勫璞★細' + JSON.stringify(data) });
+
+      var previousButton = this.buttons.find((x) => x.value == "Previous");
+      if (previousButton) previousButton.hidden = true;
+      var nextButton = this.buttons.find((x) => x.value == "Next");
+      if (nextButton) nextButton.hidden = true;
+      var recoveryButton = this.buttons.find((x) => x.value == "TaskRecovery");
+      if (recoveryButton) recoveryButton.hidden = true;
+
+      //鎵╁睍椤甸潰鍒濆鍖栨搷浣�
+      this.columns.push({
+        field: "鎿嶄綔",
+        title: "鎿嶄綔",
+        width: 70,
+        fixed: "right",
+        align: "center",
+        formatter: (row) => {
+          return '<i style="cursor: pointer;color: #2d8cf0;"class="el-icon-view">鏌ョ湅</i>';
+        },
+        click: (row) => {
+          this.$refs.gridBody.open(row);
+        },
+      });
     },
-    tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
-    buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
-    methods: {
-        //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
-        onInit() {
-            // this.$Notice.success({ title: this.detailOptions.cnName + ',鏌ヨ缁撴灉', desc: '杩斿洖鐨勫璞★細' + JSON.stringify(data) });
+    onInited() {
+      //妗嗘灦鍒濆鍖栭厤缃悗
+      //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
+      //this.detailOptions.columns.forEach(column=>{ });
+    },
+    searchBefore(param) {
+      //鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
+      //杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
+      // 绗竴涓繃婊ゆ潯浠�
+      const roadwayFilter1 = {
+        name: "roadway",
+        value: "ZJSC1",
+        displayType: "notequal",
+      };
 
-            var previousButton = this.buttons.find((x) => x.value == "Previous");
-            if (previousButton) previousButton.hidden = true;
-            var nextButton = this.buttons.find((x) => x.value == "Next");
-            if (nextButton) nextButton.hidden = true;
-            var recoveryButton = this.buttons.find((x) => x.value == "TaskRecovery");
-            if (recoveryButton) recoveryButton.hidden = true;
+      // 绗簩涓繃婊ゆ潯浠�
+      const roadwayFilter2 = {
+        name: "roadway",
+        value: "FJSC1",
+        displayType: "notequal",
+      };
 
-            //鎵╁睍椤甸潰鍒濆鍖栨搷浣�
-            this.columns.push({
-                field: '鎿嶄綔',
-                title: '鎿嶄綔',
-                width: 70,
-                fixed: 'right',
-                align: 'center',
-                formatter: (row) => {
-                    return (
-                        '<i style="cursor: pointer;color: #2d8cf0;"class="el-icon-view">鏌ョ湅</i>'
-                    );
-                },
-                click: (row) => {
-                    this.$refs.gridBody.open(row);
-                }
-            });
-        },
-        onInited() {
-            //妗嗘灦鍒濆鍖栭厤缃悗
-            //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
-            //this.detailOptions.columns.forEach(column=>{ });
-        },
-        searchBefore(param) {
-            //鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
-            //杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
-            return true;
-        },
-        searchAfter(result) {
-            //鏌ヨ鍚庯紝result杩斿洖鐨勬煡璇㈡暟鎹�,鍙互鍦ㄦ樉绀哄埌琛ㄦ牸鍓嶅鐞嗚〃鏍肩殑鍊�
-            return true;
-        },
-        addBefore(formData) {
-            //鏂板缓淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛紝鍙互缁欑粰琛ㄥ崟璁剧疆鍊硷紝鑷繁杈撳嚭鐪媐ormData鐨勫��
-            return true;
-        },
-        updateBefore(formData) {
-            //缂栬緫淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛ㄣ�佸垹闄よ鐨処d
-            return true;
-        },
-        rowClick({ row, column, event }) {
-            //鏌ヨ鐣岄潰鐐瑰嚮琛屼簨浠�
-            // this.$refs.table.$refs.table.toggleRowSelection(row); //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
-        },
-        modelOpenAfter(row) {
-            //鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚庯紝鍙互鍦ㄦ澶勫啓閫昏緫锛屽锛屼粠鍚庡彴鑾峰彇鏁版嵁
-            //(1)鍒ゆ柇鏄紪杈戣繕鏄柊寤烘搷浣滐細 this.currentAction=='Add';
-            //(2)缁欏脊鍑烘璁剧疆榛樿鍊�
-            //(3)this.editFormFields.瀛楁='xxx';
-            //濡傛灉闇�瑕佺粰涓嬫媺妗嗚缃粯璁ゅ�硷紝璇烽亶鍘唗his.editFormOptions鎵惧埌瀛楁閰嶇疆瀵瑰簲data灞炴�х殑key鍊�
-            //鐪嬩笉鎳傚氨鎶婅緭鍑虹湅锛歝onsole.log(this.editFormOptions)
-        }
-    }
+      if (!param.wheres) {
+        param.wheres = [];
+      }
+
+      // 灏嗕袱涓繃婊ゆ潯浠舵坊鍔犲埌鏌ヨ鍙傛暟涓�
+      param.wheres.push(roadwayFilter1);
+      param.wheres.push(roadwayFilter2);
+      return true;
+    },
+    searchAfter(result) {
+      //鏌ヨ鍚庯紝result杩斿洖鐨勬煡璇㈡暟鎹�,鍙互鍦ㄦ樉绀哄埌琛ㄦ牸鍓嶅鐞嗚〃鏍肩殑鍊�
+      return true;
+    },
+    addBefore(formData) {
+      //鏂板缓淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛紝鍙互缁欑粰琛ㄥ崟璁剧疆鍊硷紝鑷繁杈撳嚭鐪媐ormData鐨勫��
+      return true;
+    },
+    updateBefore(formData) {
+      //缂栬緫淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛ㄣ�佸垹闄よ鐨処d
+      return true;
+    },
+    rowClick({ row, column, event }) {
+      //鏌ヨ鐣岄潰鐐瑰嚮琛屼簨浠�
+      // this.$refs.table.$refs.table.toggleRowSelection(row); //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
+    },
+    modelOpenAfter(row) {
+      //鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚庯紝鍙互鍦ㄦ澶勫啓閫昏緫锛屽锛屼粠鍚庡彴鑾峰彇鏁版嵁
+      //(1)鍒ゆ柇鏄紪杈戣繕鏄柊寤烘搷浣滐細 this.currentAction=='Add';
+      //(2)缁欏脊鍑烘璁剧疆榛樿鍊�
+      //(3)this.editFormFields.瀛楁='xxx';
+      //濡傛灉闇�瑕佺粰涓嬫媺妗嗚缃粯璁ゅ�硷紝璇烽亶鍘唗his.editFormOptions鎵惧埌瀛楁閰嶇疆瀵瑰簲data灞炴�х殑key鍊�
+      //鐪嬩笉鎳傚氨鎶婅緭鍑虹湅锛歝onsole.log(this.editFormOptions)
+    },
+  },
 };
 export default extension;
diff --git a/Code/WMS/WIDESEA_WMSClient/src/extension/stock/groupPalle.jsx b/Code/WMS/WIDESEA_WMSClient/src/extension/stock/groupPalle.jsx
index 1f74685..520dcd1 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/extension/stock/groupPalle.jsx
+++ b/Code/WMS/WIDESEA_WMSClient/src/extension/stock/groupPalle.jsx
@@ -100,7 +100,7 @@
       // 妗嗘灦鍒濆鍖栭厤缃悗
     },
     searchBefore(param) {
-      const locationCodeFilter = {
+      const stockStatusFilter = {
         name: "stockStatus",
         value: "1",
         displayType: "int"
@@ -109,7 +109,7 @@
         param.wheres = [];
       }
       // 灏嗚繃婊ゆ潯浠舵坊鍔犲埌鏌ヨ鍙傛暟涓�
-      param.wheres.push(locationCodeFilter);
+      param.wheres.push(stockStatusFilter);
       return true;
     },
     searchAfter(result) {
diff --git a/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stock.jsx b/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stock.jsx
index 52a7c05..41d59e3 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stock.jsx
+++ b/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stock.jsx
@@ -43,6 +43,16 @@
       }
     },
     searchBefore(param) {
+      const stockStatusFilter = {
+        name: "stockStatus",
+        value: "1",
+        displayType: "notequal"
+      };
+      if (!param.wheres) {
+        param.wheres = [];
+      }
+      // 灏嗚繃婊ゆ潯浠舵坊鍔犲埌鏌ヨ鍙傛暟涓�
+      param.wheres.push(stockStatusFilter);
       return true;
     },
     searchAfter(result) {
diff --git a/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx b/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx
index 6d53e9c..0204d4e 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx
+++ b/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx
@@ -8,21 +8,21 @@
     gridBody: RobotSelect,
     gridFooter: '',
     //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
-    modelHeader: '',
-    modelBody: '',
-    modelFooter: ''
+    modelHeader: "",
+    modelBody: "",
+    modelFooter: "",
   },
-  tableAction: '',
+  tableAction: "",
   buttons: { view: [], box: [], detail: [] },
   methods: {
     onInit() {
       // 娣诲姞MES鎿嶄綔鍒�
       this.columns.push({
-        title: '鎿嶄綔',
-        field: '鎿嶄綔',
-        align: 'center',
+        title: "鎿嶄綔",
+        field: "鎿嶄綔",
+        align: "center",
         width: 200,
-        fixed: 'right',
+        fixed: "right",
         render: (h, { row, column, index }) => {
           return (
             <div>
@@ -50,7 +50,7 @@
               >瑙ｇ粦</el-button>
             </div>
           );
-        }
+        },
       });
     },
 
@@ -62,16 +62,24 @@
     // 鎵樼洏杩涚珯鎿嶄綔
     async handleInbound(row) {
       try {
-        await this.$confirm(`纭鎵ц鎵樼洏杩涚珯鎿嶄綔锛焅n鎵樼洏缂栧彿锛�${row.palletCode}`, "杩涚珯纭", {
-          confirmButtonText: "纭",
-          cancelButtonText: "鍙栨秷",
-          type: "warning"
-        });
+        await this.$confirm(
+          `纭鎵ц鎵樼洏杩涚珯鎿嶄綔锛焅n鎵樼洏缂栧彿锛�${row.palletCode}`,
+          "杩涚珯纭",
+          {
+            confirmButtonText: "纭",
+            cancelButtonText: "鍙栨秷",
+            type: "warning",
+          },
+        );
 
-        const result = await this.http.post("/api/StockInfo/inboundInContainer", {
-          palletCode: row.palletCode,
-          stockId: row.id
-        }, "姝ｅ湪璋冪敤MES鎺ュ彛...");
+        const result = await this.http.post(
+          "/api/StockInfo/inboundInContainer",
+          {
+            palletCode: row.palletCode,
+            stockId: row.id,
+          },
+          "姝ｅ湪璋冪敤MES鎺ュ彛...",
+        );
 
         if (result.status) {
           this.$Message.success(result.message || "鎵樼洏杩涚珯鎴愬姛");
@@ -89,16 +97,24 @@
     // 鎵樼洏鍑虹珯鎿嶄綔
     async handleOutbound(row) {
       try {
-        await this.$confirm(`纭鎵ц鎵樼洏鍑虹珯鎿嶄綔锛焅n鎵樼洏缂栧彿锛�${row.palletCode}`, "鍑虹珯纭", {
-          confirmButtonText: "纭",
-          cancelButtonText: "鍙栨秷",
-          type: "warning"
-        });
+        await this.$confirm(
+          `纭鎵ц鎵樼洏鍑虹珯鎿嶄綔锛焅n鎵樼洏缂栧彿锛�${row.palletCode}`,
+          "鍑虹珯纭",
+          {
+            confirmButtonText: "纭",
+            cancelButtonText: "鍙栨秷",
+            type: "warning",
+          },
+        );
 
-        const result = await this.http.post("/api/StockInfo/outboundInContainer", {
-          palletCode: row.palletCode,
-          stockId: row.id
-        }, "姝ｅ湪璋冪敤MES鎺ュ彛...");
+        const result = await this.http.post(
+          "/api/StockInfo/outboundInContainer",
+          {
+            palletCode: row.palletCode,
+            stockId: row.id,
+          },
+          "姝ｅ湪璋冪敤MES鎺ュ彛...",
+        );
 
         if (result.status) {
           this.$Message.success(result.message || "鎵樼洏鍑虹珯鎴愬姛");
@@ -122,6 +138,16 @@
       // 妗嗘灦鍒濆鍖栭厤缃悗
     },
     searchBefore(param) {
+      const stockStatusFilter = {
+        name: "stockStatus",
+        value: "1",
+        displayType: "notequal",
+      };
+      if (!param.wheres) {
+        param.wheres = [];
+      }
+      // 灏嗚繃婊ゆ潯浠舵坊鍔犲埌鏌ヨ鍙傛暟涓�
+      param.wheres.push(stockStatusFilter);
       return true;
     },
     searchAfter(result) {
@@ -138,8 +164,8 @@
     },
     modelOpenAfter(row) {
       // 鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚�
-    }
-  }
+    },
+  },
 };
 
 export default extension;
diff --git a/Code/WMS/WIDESEA_WMSClient/src/extension/taskinfo/agvTask.jsx b/Code/WMS/WIDESEA_WMSClient/src/extension/taskinfo/agvTask.jsx
index ddca5c7..6abcb89 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/extension/taskinfo/agvTask.jsx
+++ b/Code/WMS/WIDESEA_WMSClient/src/extension/taskinfo/agvTask.jsx
@@ -28,14 +28,14 @@
   // 绗竴涓繃婊ゆ潯浠�
   const roadwayFilter1 = {
     name: "roadway",
-    value: "ZJ1",
+    value: "ZJSC1",
     displayType: "like",
   };
   
   // 绗簩涓繃婊ゆ潯浠�
   const roadwayFilter2 = {
     name: "roadway",
-    value: "FJ1",
+    value: "FJSC1",
     displayType: "like",
   };
 
diff --git a/Code/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.jsx b/Code/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.jsx
index be40abf..28cee0f 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.jsx
+++ b/Code/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.jsx
@@ -1,47 +1,48 @@
-
 //姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-import gridBodyExtension from './extend/gridBodyExtension.vue'
+import gridBodyExtension from "./extend/gridBodyExtension.vue";
 
 let extension = {
-    components: {
-      //鏌ヨ鐣岄潰鎵╁睍缁勪欢
-      gridHeader: '',
-      gridBody: gridBodyExtension,
-      gridFooter: '',
-      //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
-      modelHeader: '',
-      modelBody: '',
-      modelFooter: '',
-    },
-    tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
-    buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
-    methods: {
-       //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
-      onInit() {
-        //娣诲姞"鎵嬪姩鍒涘缓浠诲姟"鎸夐挳
-        this.buttons.push({
-          name: '鎵嬪姩鍒涘缓浠诲姟',
-          icon: 'el-icon-plus',
-          type: 'primary',
-          value: 'ManualCreateTask',
-          onClick: () => {
-            this.$refs.gridBody.open();
-          }
-        });
-        //娣诲姞"鎵嬪姩涓嬪彂"鎸夐挳
-        this.buttons.push({
-          name: '鎵嬪姩涓嬪彂',
-          icon: 'el-icon-s-promotion',
-          type: 'primary',
-          value: 'DispatchTasksToWCS',
-          onClick: () => {
-            let rows = this.$refs.table.getSelected();
-            if (rows.length == 0) return this.$error("璇峰厛閫夋嫨浠诲姟");
-            this.$refs.gridBody.openDispatch(rows);
-          }
-        });
+  components: {
+    //鏌ヨ鐣岄潰鎵╁睍缁勪欢
+    gridHeader: "",
+    gridBody: gridBodyExtension,
+    gridFooter: "",
+    //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
+    modelHeader: "",
+    modelBody: "",
+    modelFooter: "",
+  },
+  tableAction: "", //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+  buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
+  methods: {
+    //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
+    onInit() {
+      //娣诲姞"鎵嬪姩鍒涘缓浠诲姟"鎸夐挳
+      this.buttons.push({
+        name: "鎵嬪姩鍒涘缓浠诲姟",
+        icon: "el-icon-plus",
+        type: "primary",
+        value: "ManualCreateTask",
+        onClick: () => {
+          this.$refs.gridBody.open();
+        },
+      });
+      //娣诲姞"鎵嬪姩涓嬪彂"鎸夐挳
+      this.buttons.push({
+        name: "鎵嬪姩涓嬪彂",
+        icon: "el-icon-s-promotion",
+        type: "primary",
+        value: "DispatchTasksToWCS",
+        onClick: () => {
+          let rows = this.$refs.table.getSelected();
+          if (rows.length == 0) return this.$error("璇峰厛閫夋嫨浠诲姟");
+          this.$refs.gridBody.openDispatch(rows);
+        },
+      });
 
-        let TaskHandCancelBtn = this.buttons.find(x => x.value == 'TaskHandCancel');
+      let TaskHandCancelBtn = this.buttons.find(
+        (x) => x.value == "TaskHandCancel",
+      );
       if (TaskHandCancelBtn) {
         TaskHandCancelBtn.onClick = function () {
           let rows = this.$refs.table.getSelected();
@@ -49,18 +50,20 @@
           if (rows.length > 1) return this.$error("璇烽�夋嫨涓�鏉℃暟鎹�!");
           var param = rows[0].taskNum;
           this.http
-            .post("api/Task/TaskCancel?taskNum="+param, "鏁版嵁澶勭悊涓�...")
+            .post("api/Task/TaskCancel?taskNum=" + param, "鏁版嵁澶勭悊涓�...")
             .then((x) => {
               if (x.status) {
-                this.$Message.success('浠诲姟鍙栨秷鎴愬姛.');
+                this.$Message.success("浠诲姟鍙栨秷鎴愬姛.");
                 this.refresh();
               } else {
                 return this.$error(x.message);
               }
             });
-        }
+        };
       }
-      let TaskHandCompletedBtn = this.buttons.find(x => x.value == 'TaskHandCompleted');
+      let TaskHandCompletedBtn = this.buttons.find(
+        (x) => x.value == "TaskHandCompleted",
+      );
       if (TaskHandCompletedBtn) {
         TaskHandCompletedBtn.onClick = function () {
           let rows = this.$refs.table.getSelected();
@@ -68,52 +71,74 @@
           if (rows.length > 1) return this.$error("璇烽�夋嫨涓�鏉℃暟鎹�!");
           var param = rows[0].taskNum;
           this.http
-            .post("api/Task/TaskCompleted?taskNum="+param, "鏁版嵁澶勭悊涓�...")
+            .post("api/Task/TaskCompleted?taskNum=" + param, "鏁版嵁澶勭悊涓�...")
             .then((x) => {
               if (x.status) {
-                this.$Message.success('浠诲姟鎵嬪姩瀹屾垚');
+                this.$Message.success("浠诲姟鎵嬪姩瀹屾垚");
                 this.refresh();
               } else {
                 return this.$error(x.message);
               }
             });
-        }
+        };
       }
-      },
-      onInited() {
-        //妗嗘灦鍒濆鍖栭厤缃悗
-        //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
-        //this.detailOptions.columns.forEach(column=>{ });
-      },
-      searchBefore(param) {
-        //鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
-        //杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
-        return true;
-      },
-      searchAfter(result) {
-        //鏌ヨ鍚庯紝result杩斿洖鐨勬煡璇㈡暟鎹�,鍙互鍦ㄦ樉绀哄埌琛ㄦ牸鍓嶅鐞嗚〃鏍肩殑鍊�
-        return true;
-      },
-      addBefore(formData) {
-        //鏂板缓淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛紝鍙互缁欑粰琛ㄥ崟璁剧疆鍊硷紝鑷繁杈撳嚭鐪媐ormData鐨勫��
-        return true;
-      },
-      updateBefore(formData) {
-        //缂栬緫淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛ㄣ�佸垹闄よ鐨処d
-        return true;
-      },
-      rowClick({ row, column, event }) {
-        //鏌ヨ鐣岄潰鐐瑰嚮琛屼簨浠�
-        this.$refs.table.$refs.table.toggleRowSelection(row); //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
-      },
-      modelOpenAfter(row) {
-        //鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚庯紝鍙互鍦ㄦ澶勫啓閫昏緫锛屽锛屼粠鍚庡彴鑾峰彇鏁版嵁
-        //(1)鍒ゆ柇鏄紪杈戣繕鏄柊寤烘搷浣滐細 this.currentAction=='Add';
-        //(2)缁欏脊鍑烘璁剧疆榛樿鍊�
-        //(3)this.editFormFields.瀛楁='xxx';
-        //濡傛灉闇�瑕佺粰涓嬫媺妗嗚缃粯璁ゅ�硷紝璇烽亶鍘唗his.editFormOptions鎵惧埌瀛楁閰嶇疆瀵瑰簲data灞炴�х殑key鍊�
-        //鐪嬩笉鎳傚氨鎶婅緭鍑虹湅锛歝onsole.log(this.editFormOptions)
+    },
+    onInited() {
+      //妗嗘灦鍒濆鍖栭厤缃悗
+      //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
+      //this.detailOptions.columns.forEach(column=>{ });
+    },
+    searchBefore(param) {
+      //鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
+      //杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
+
+      // 绗竴涓繃婊ゆ潯浠�
+      const roadwayFilter1 = {
+        name: "roadway",
+        value: "ZJSC1",
+        displayType: "notequal",
+      };
+
+      // 绗簩涓繃婊ゆ潯浠�
+      const roadwayFilter2 = {
+        name: "roadway",
+        value: "FJSC1",
+        displayType: "notequal",
+      };
+
+      if (!param.wheres) {
+        param.wheres = [];
       }
-    }
-  };
-  export default extension;
+
+      // 灏嗕袱涓繃婊ゆ潯浠舵坊鍔犲埌鏌ヨ鍙傛暟涓�
+      param.wheres.push(roadwayFilter1);
+      param.wheres.push(roadwayFilter2);
+      return true;
+    },
+    searchAfter(result) {
+      //鏌ヨ鍚庯紝result杩斿洖鐨勬煡璇㈡暟鎹�,鍙互鍦ㄦ樉绀哄埌琛ㄦ牸鍓嶅鐞嗚〃鏍肩殑鍊�
+      return true;
+    },
+    addBefore(formData) {
+      //鏂板缓淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛紝鍙互缁欑粰琛ㄥ崟璁剧疆鍊硷紝鑷繁杈撳嚭鐪媐ormData鐨勫��
+      return true;
+    },
+    updateBefore(formData) {
+      //缂栬緫淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛ㄣ�佸垹闄よ鐨処d
+      return true;
+    },
+    rowClick({ row, column, event }) {
+      //鏌ヨ鐣岄潰鐐瑰嚮琛屼簨浠�
+      this.$refs.table.$refs.table.toggleRowSelection(row); //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
+    },
+    modelOpenAfter(row) {
+      //鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚庯紝鍙互鍦ㄦ澶勫啓閫昏緫锛屽锛屼粠鍚庡彴鑾峰彇鏁版嵁
+      //(1)鍒ゆ柇鏄紪杈戣繕鏄柊寤烘搷浣滐細 this.currentAction=='Add';
+      //(2)缁欏脊鍑烘璁剧疆榛樿鍊�
+      //(3)this.editFormFields.瀛楁='xxx';
+      //濡傛灉闇�瑕佺粰涓嬫媺妗嗚缃粯璁ゅ�硷紝璇烽亶鍘唗his.editFormOptions鎵惧埌瀛楁閰嶇疆瀵瑰簲data灞炴�х殑key鍊�
+      //鐪嬩笉鎳傚氨鎶婅緭鍑虹湅锛歝onsole.log(this.editFormOptions)
+    },
+  },
+};
+export default extension;
diff --git a/Code/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue b/Code/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue
index 829120d..8d9a979 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue
+++ b/Code/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue
@@ -27,7 +27,15 @@
       sortName: "id",
     });
     const editFormFields = ref({
+      locationCode: "",
+      warehouseId: "",
+      roadwayNo: "",
+      locationType: "",
+      enableStatus: "",
       locationStatus: "",
+      row: "",
+      column: "",
+      layer: "",
     });
     const editFormOptions = ref([
       [
diff --git a/Code/WMS/WIDESEA_WMSClient/src/views/stock/groupPalle.vue b/Code/WMS/WIDESEA_WMSClient/src/views/stock/groupPalle.vue
index 0c45982..17b5580 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/views/stock/groupPalle.vue
+++ b/Code/WMS/WIDESEA_WMSClient/src/views/stock/groupPalle.vue
@@ -64,26 +64,35 @@
       sortName: "id",
     });
 
-    const editFormFields = ref({
+     const editFormFields = ref({
       palletCode: "",
+      palletType: 0,
+      warehouseId: 0,
+      mesUploadStatus: "",
+      stockStatus: "",
       locationCode: "",
+      locationDetails: ""
     });
+
 
     const editFormOptions = ref([
       [
         { field: "palletCode", title: TEXT.palletCode, type: "string" },
+        { field: "stockStatus", title: TEXT.stockStatus, type: "select", dataKey: "stockStatusEmun", data: []},
         { field: "locationCode", title: TEXT.locationCode, type: "string" },
       ],
     ]);
 
     const searchFormFields = ref({
       palletCode: "",
+      stockStatus: "",
       locationCode: "",
     });
 
     const searchFormOptions = ref([
       [
         { title: TEXT.palletCode, field: "palletCode", type: "like" },
+        { title: TEXT.stockStatus, field: "stockStatus", type: "selectList", dataKey: "stockStatusEmun", data: [] },
         { title: TEXT.locationCode, field: "locationCode", type: "like" },
       ],
     ]);
diff --git a/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue b/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue
index e2a0e52..6703a37 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue
+++ b/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue
@@ -64,26 +64,35 @@
       sortName: "id",
     });
 
-    const editFormFields = ref({
+     const editFormFields = ref({
       palletCode: "",
+      palletType: 0,
+      warehouseId: 0,
+      mesUploadStatus: "",
+      stockStatus: "",
       locationCode: "",
+      locationDetails: ""
     });
+
 
     const editFormOptions = ref([
       [
         { field: "palletCode", title: TEXT.palletCode, type: "string" },
+        { field: "stockStatus", title: TEXT.stockStatus, type: "select", dataKey: "stockStatusEmun", data: []},
         { field: "locationCode", title: TEXT.locationCode, type: "string" },
       ],
     ]);
 
     const searchFormFields = ref({
       palletCode: "",
+      stockStatus: "",
       locationCode: "",
     });
 
     const searchFormOptions = ref([
       [
         { title: TEXT.palletCode, field: "palletCode", type: "like" },
+        { title: TEXT.stockStatus, field: "stockStatus", type: "selectList", dataKey: "stockStatusEmun", data: [] },
         { title: TEXT.locationCode, field: "locationCode", type: "like" },
       ],
     ]);
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/WareHouseEnum/WarehouseEnum.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/WareHouseEnum/WarehouseEnum.cs
index 132dd2e..7d6750a 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/WareHouseEnum/WarehouseEnum.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/WareHouseEnum/WarehouseEnum.cs
@@ -33,21 +33,21 @@
         /// 鍒嗗1鍙蜂粨搴�
         /// </summary>
         [Description("鍒嗗1鍙蜂粨搴�")]
-        HCFR1 = 3,
+        HCSC1 = 3,
         /// <summary>
         /// 楂樻俯2鍙蜂粨搴�
         /// </summary>
         [Description("楂樻俯2鍙蜂粨搴�")]
-        GW2 = 4,
+        GWSC2 = 4,
         /// <summary>
         /// 姝ｆ瀬鍗蜂粨
         /// </summary>
         [Description("姝ｆ瀬鍗蜂粨")]
-        ZJ1 = 5,
+        ZJ1 = 6,
         /// <summary>
         /// 璐熸瀬鍗蜂粨
         /// </summary>
         [Description("璐熸瀬鍗蜂粨")]
-        FJ1 = 6
+        FJ1 = 7
     }
 }
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/HtmlElementType.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/HtmlElementType.cs
index 735718d..bff8aeb 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/HtmlElementType.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/HtmlElementType.cs
@@ -16,7 +16,7 @@
         public const string textarea = "textarea";
         public const string thanorequal = "thanorequal";
         public const string lessorequal = "lessorequal";
-
+        public const string notequal = "notequal";
 
         public const string gt = "gt";
         public const string lt = "lt";
@@ -28,5 +28,6 @@
         public const string LessOrequal = "<=";
         public const string Contains = "in";
         public const string Equal = "=";
+        public const string NotEqual = "!=";
     }
 }
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs
index 68dc513..d71ebea 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs
@@ -978,6 +978,15 @@
                     break;
                 case HtmlElementType.like:
                     linqExpression = LinqExpressionType.Contains;
+                    break;
+                case HtmlElementType.thanorequal:
+                    linqExpression = LinqExpressionType.ThanOrEqual;
+                    break;
+                case HtmlElementType.lessorequal:
+                    linqExpression = LinqExpressionType.LessThanOrEqual;
+                    break;
+                case HtmlElementType.notequal:
+                    linqExpression = LinqExpressionType.NotEqual;
                     break;
                 default:
                     linqExpression = LinqExpressionType.Equal;

--
Gitblit v1.9.3