diff --git a/public/config.json b/public/config.json index 7ca6b5f..23d8f3b 100644 --- a/public/config.json +++ b/public/config.json @@ -1,6 +1,6 @@ { - "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/", - "BASE_URL":"http://192.168.0.109:9991/", - "SERVER_IP": "http://192.168.0.109:9991/", - "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/" + "UDI_SYNC_SERVER_IP": "http://192.168.0.105:9995/", + "BASE_URL":"http://192.168.0.105:9991/", + "SERVER_IP": "http://192.168.0.105:9991/", + "WEBSOCKET_URL": "ws://192.168.0.105:9991/UDI_WMS_MC/api/websocket/" } diff --git a/src/api/basic/EntrustRece.js b/src/api/basic/EntrustRece.js new file mode 100644 index 0000000..3787f97 --- /dev/null +++ b/src/api/basic/EntrustRece.js @@ -0,0 +1,44 @@ +import axios from "../../utils/axios"; + +export function getEntrustRece(query) { + return axios({ + url: "/spms/entrust/rece/filter", + method: "get", + params: query + }); +} + +export function deleteEntrustRece(query) { + return axios({ + url: "/spms/entrust/rece/delete", + method: "post", + data: query + }); +} + +export function updateEntrustRece(query) { + return axios({ + url: "/spms/entrust/rece/update", + method: "post", + data: query + }); +} + +export function insertEntrustRece(query) { + return axios({ + url: "/spms/entrust/rece/add", + method: "post", + data: query + }); +} + + +export function filterNoUseBusType(query) { + return axios({ + url: "/spms/entrust/rece/filterAllNoUse", + method: "get", + params: query + }); +} + + diff --git a/src/api/basic/invWarehouse.js b/src/api/basic/invWarehouse.js index a9d0f1a..056625c 100644 --- a/src/api/basic/invWarehouse.js +++ b/src/api/basic/invWarehouse.js @@ -18,6 +18,16 @@ export function filterAll(query) { params: query }); } + +export function filterNext(query) { + return axios({ + url: "/spms/inv/warehouse/filterNext", + method: "get", + params: query + }); +} + + export function filterAllByLoc(query) { return axios({ url: "/spms/inv/warehouse/filterAllLocInv", @@ -180,3 +190,12 @@ export function getThrsysDetail(params) { params: params }); } + +//替换单据条码 +export function replaceCodes(data) { + return axios({ + url: "/warehouse/inout/replaceCodes", + method: "post", + data: data + }) +} diff --git a/src/views/basic/BasicEntrutsRece.vue b/src/views/basic/BasicEntrutsRece.vue new file mode 100644 index 0000000..0ab707c --- /dev/null +++ b/src/views/basic/BasicEntrutsRece.vue @@ -0,0 +1,302 @@ + + diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue new file mode 100644 index 0000000..1a47aab --- /dev/null +++ b/src/views/basic/BasicEntrutsReceModify.vue @@ -0,0 +1,310 @@ + + + + + diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue index 9c164e9..f2baca0 100644 --- a/src/views/inout/IOAddOrder.vue +++ b/src/views/inout/IOAddOrder.vue @@ -172,7 +172,7 @@ 是否预验收产品 + >是否只采集预验收产品 @@ -560,6 +560,7 @@ export default { this.checkSuccess = false; this.formData.code = response.data; this.originCode = this.formData.code; + this.$message.error(response.message); } else if (response.code == 503) { this.checkSuccess = false; this.formData.code = response.data;