Merge branch 'dev' into xiaoyang

wanshenmean

2 天以前 ef57389fd66aca85d6fb4a73c0f7c1c1f7d607b2

 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) {