Merge branch 'xiaoyang' into dev

wanshenmean

3 天以前 ff006f77f6267fc0d2c4ee810d897a85165f5b8f

 Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx

@@ -125,9 +125,9 @@
    },
    searchBefore(param) {
      const stockStatusFilter = {
        name: "stockStatus",
        value: "1",
        displayType: "notequal",
        name: "LocationId",
        value: "0",
        displayType: "notequal"
      };
      if (!param.wheres) {
        param.wheres = [];