Merge remote-tracking branch 'origin/orderChange' into zhairh

# Conflicts:
#	src/views/inventory/invMAOrderAudit.vue

src/api/inout/stockOrder.js

@@ -316,13 +316,13 @@ export function submitStockOrderToThirdSys(params) {
     })
 }
 
-export function findOrderByStockOrder(query) {
+// export function findOrderByStockOrder(query) {
-    return axios({
+//     return axios({
-        url: "/udiwms/inout/order/findOrderByStockOrder",
+//         url: "/udiwms/inout/order/findOrderByStockOrder",
-        method: 'get',
+//         method: 'get',
-        params: query
+//         params: query
-    });
+//     });
-}
+// }
 
 export function rollbackOrder(params) {
     return axios({
@@ -343,3 +343,5 @@ export function rollUnReceivebackOrder(params) {
 
 
 
+
+