Merge branch 'master' of http://192.168.1.160:3000/zhaohanlin/rtk-web-wms-cloud

 Conflicts:

	.env.dev

.env.dev

@@ -7,7 +7,7 @@ VUE_APP_TITLE = RTKWMS开发环境
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://192.168.1.94:48080'
  VUE_APP_BASE_API = 'http://127.0.0.1:48080'
-# VUE_APP_BASE_API = 'http://113.105.183.190:48064'
+# VUE_APP_BASE_API = 'http://113.105.183.190:42699'
 #VUE_APP_BASE_API = 'http://113.105.183.190:48163'
 
 # 报表IP

src/api/wms/incoming/production.js

@@ -2,73 +2,73 @@ import request from "@/utils/request";
 
 // 获得入库业务 生产入库
 export function getIncomingProduce(id) {
-    return request({
-        url: "/rtkwms/incoming-produce/get?id=" + id,
-        method: "get",
-    });
+  return request({
+    url: "/rtkwms/incoming-produce/get?id=" + id,
+    method: "get",
+  });
 }
 
 // 获得入库业务 生产入库分页--待入库
 export function getIncomingProducePage(query) {
-    return request({
-        url: "/rtkwms/incoming-produce/page",
-        method: "get",
-        params: query,
-    });
+  return request({
+    url: "/rtkwms/incoming-produce/page",
+    method: "get",
+    params: query,
+  });
 }
 // 获得入库业务 生产入库分页--已入库
 export function getIncomingProduceStockedPage(query) {
-    return request({
-        url: "/rtkwms/incoming-produce/stockedPage",
-        method: "get",
-        params: query,
-    });
+  return request({
+    url: "/rtkwms/incoming-produce/stockedPage",
+    method: "get",
+    params: query,
+  });
 }
 // 获得入库业务 生产入库分页--待入库
 export function getIncomingProduceDetailPage(query) {
-    return request({
-        url: "/rtkwms/incoming-produce-detail/ToStockPage",
-        method: "get",
-        params: query,
-    });
+  return request({
+    url: "/rtkwms/incoming-produce-detail/ToStockPage",
+    method: "get",
+    params: query,
+  });
 }
 export function countProductInStoragePage(query) {
-    return request({
-        url: "/mes/product-in-storage/countProductInStoragePage",
-        method: "get",
-        params: query,
-    });
+  return request({
+    url: "/rtkwms/product-in-storage/countProductInStoragePage",
+    method: "get",
+    params: query,
+  });
 }
 // 获得入库业务 生产入库明细分页--已入库
 export function getIncomingProduceDetailStockedPage(query) {
-    return request({
-        url: "/rtkwms/incoming-produce-detail/page",
-        method: "get",
-        params: query,
-    });
+  return request({
+    url: "/rtkwms/incoming-produce-detail/page",
+    method: "get",
+    params: query,
+  });
 }
 // 获得入库业务 入库方案列表
 export function getIncomingProduceDetailToStockListPage(query) {
-    return request({
-        url: "/rtkwms/incoming-produce-detail/toStockListPage",
-        method: "get",
-        params: query,
-    });
+  return request({
+    url: "/rtkwms/incoming-produce-detail/toStockListPage",
+    method: "get",
+    params: query,
+  });
 }
 // 创建WMS 入库业务-来料入库
 export function createBatchIncomingProduceDetail(data) {
-    return request({
-        url: "/rtkwms/incoming-produce-detail/createBatch",
-        method: "post",
-        data: data,
-    });
+  return request({
+    url: "/rtkwms/incoming-produce-detail/createBatch",
+    method: "post",
+    data: data,
+  });
 }
 
 // 获取入库类型下拉列表
 export function getStockLogicList(query) {
-    return request({
-        url: "/rtkwms/stock/stockLogicList",
-        method: "get",
-        params: query,
-    });
-}
+  return request({
+    url: "/rtkwms/stock/stockLogicList",
+    method: "get",
+    params: query,
+  });
+}