diff --git a/fe/PDA/api/index.js b/fe/PDA/api/index.js index 940cb18a1..cb9a79822 100644 --- a/fe/PDA/api/index.js +++ b/fe/PDA/api/index.js @@ -2249,11 +2249,27 @@ export const getWorkStationByLocation = (locationCode) => request( //获取位置码信息 export const returnWarhouseSubmit = (params) => request( - devUrl + returnWareHouseUrl, { // + returnWareHouseUrl+"/wms/api/RestJsonService/notifyOutTaskBack4FW", { // data: params, method: "post" }); +//拆箱 提交 +export function splitPackingSubmit(params) { // + return request(devUrl + "/api/pda/store/separation-packing-note", { // + data: params, + method: "post" + }) +} + +//合箱提交 +export function mergePackingSubmit(params) { // + return request(devUrl + "/api/pda/store/integration-packing-note", { // + data: params, + method: "post" + }) +} + \ No newline at end of file diff --git a/fe/PDA/common/basic.js b/fe/PDA/common/basic.js index 87e769587..76e139dc4 100644 --- a/fe/PDA/common/basic.js +++ b/fe/PDA/common/basic.js @@ -106,6 +106,20 @@ export function getInventoryStatusDesc(val) { else return '其他' } +export function getInventoryStatusList() { + var list=["待检","合格","不合格","隔离","报废","冻结"] + return list; +} + +export function getInventoryStatusValueList(val) { + if (val == '待检') return 1 + else if (val == '合格') return 2 + else if (val == '不合格') return 3 + else if (val == '隔离') return 4 + else if (val == '报废') return 5 + else if (val == '冻结') return 6 +} + //零件状态 export function getItemTypeStyle(val) { if (val == 0) return 'unk' @@ -232,7 +246,7 @@ export function getContainerTypeArray() { }, { name: '外物流', value: "OutLogistics", - + }]; return array; } @@ -244,9 +258,9 @@ export function getContainerTypeName(val) { }, { name: '外物流', value: "OutLogistics", - + }]; - + let item = array.find(r => r.value == val); return item.name; } @@ -255,17 +269,17 @@ export function getPositionCodeName(type) { let array = [{ name: '注塑区', type: 1, - },{ + }, { name: '喷涂区', type: 2, - },{ + }, { name: '装配区', type: 3, }, { name: 'kitting区', type: 4, }]; - + let item = array.find(r => r.type == type); return item.name; } @@ -335,6 +349,15 @@ export function dateFormat(time) { let date = new Date(time); return getDate(date) + " " + getTime(date); } +//带T的时间转换为毫秒值 +export function timeInMilliseconds(timeString) { + return new Date(timeString).getTime(); +} + +export function secondsToDateTime(time) { + let date = new Date(time); + return getDate(date) + "T" + getTime(date) + "Z"; +} //获取日期部分 export function getDate(date) { @@ -468,12 +491,12 @@ export function navigateBack(backIndex) { * 深度克隆对象 * @param {*} target */ -export function deepCopyData(target) { +export function deepCopyData(target) { // 克隆原始类型和null if (!(target !== null && (typeof target === 'object' || typeof target === 'function'))) { return target; } - + let cloneTarget = Array.isArray(target) ? [] : {}; // 克隆对象和数组 for (const key in target) { @@ -498,23 +521,22 @@ export function getIssueJobState(val) { // } const S4 = function() { - return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1); + return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1); }; export function guid() { - return (S4() + S4() +'-' +S4() +'-' +S4() +'-' +S4() +'-' +S4() +S4() +S4() - ); + return (S4() + S4() + '-' + S4() + '-' + S4() + '-' + S4() + '-' + S4() + S4() + S4()); } export function debounceSetting(fn, wait) { - let timeout = null; - wait = wait || 600; - return function () { - let that = this; - if(timeout !== null) clearTimeout(timeout); - timeout = setTimeout(() => { - fn.apply(that); - }, wait); - } + let timeout = null; + wait = wait || 600; + return function() { + let that = this; + if (timeout !== null) clearTimeout(timeout); + timeout = setTimeout(() => { + fn.apply(that); + }, wait); + } } \ No newline at end of file diff --git a/fe/PDA/components/uni-datetime-picker/uni-datetime-picker.vue b/fe/PDA/components/uni-datetime-picker/uni-datetime-picker.vue index ccc7959c0..bc59f8395 100644 --- a/fe/PDA/components/uni-datetime-picker/uni-datetime-picker.vue +++ b/fe/PDA/components/uni-datetime-picker/uni-datetime-picker.vue @@ -289,6 +289,7 @@ }, methods: { initPicker(newVal) { + if(!newVal)return; if (!newVal || Array.isArray(newVal) && !newVal.length) { this.$nextTick(() => { this.clear(false) diff --git a/fe/PDA/mycomponents/common/comNumberBox.vue b/fe/PDA/mycomponents/common/comNumberBox.vue index 10e729e60..382c0fac6 100644 --- a/fe/PDA/mycomponents/common/comNumberBox.vue +++ b/fe/PDA/mycomponents/common/comNumberBox.vue @@ -3,7 +3,7 @@ - - + @@ -50,6 +50,10 @@ disabled: { type: Boolean, default: false + }, + inPutDisabled: { + type: Boolean, + default: false } }, data() { diff --git a/fe/PDA/mycomponents/coms/inventory/comSplit.vue b/fe/PDA/mycomponents/coms/inventory/comSplit.vue new file mode 100644 index 000000000..cc913e1c9 --- /dev/null +++ b/fe/PDA/mycomponents/coms/inventory/comSplit.vue @@ -0,0 +1,276 @@ + + + + + \ No newline at end of file diff --git a/fe/PDA/pages.js b/fe/PDA/pages.js index 3663ce204..c1e5b8637 100644 --- a/fe/PDA/pages.js +++ b/fe/PDA/pages.js @@ -1018,6 +1018,35 @@ module.exports = () => ({ "navigationBarTitleText": "回库", "enablePullDownRefresh": false } + }, + { + "path": "pages/inventory/splitPacking", + "style": { + "navigationBarTitleText": "拆箱", + "enablePullDownRefresh": false + } + }, + + { + "path": "pages/inventory/splitPackingResult", + "style": { + "navigationBarTitleText": "拆箱结果", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/inventory/mergePacking", + "style": { + "navigationBarTitleText": "合箱", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/inventory/mergePackingResult", + "style": { + "navigationBarTitleText": "合箱结果", + "enablePullDownRefresh": false + } } diff --git a/fe/PDA/pages.json b/fe/PDA/pages.json index 550cee0aa..7bb8251a7 100644 --- a/fe/PDA/pages.json +++ b/fe/PDA/pages.json @@ -1014,6 +1014,36 @@ "navigationBarTitleText": "回库", "enablePullDownRefresh": false } + }, + { + "path": "pages/inventory/splitPacking", + "style": { + "navigationBarTitleText": "拆箱", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/inventory/splitPackingResult", + "style": { + "navigationBarTitleText": "拆箱结果", + "enablePullDownRefresh": false + } + }, + + + { + "path": "pages/inventory/mergePacking", + "style": { + "navigationBarTitleText": "合箱", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/inventory/mergePackingResult", + "style": { + "navigationBarTitleText": "合箱结果", + "enablePullDownRefresh": false + } } ], diff --git a/fe/PDA/pages/inventory/mergePacking.vue b/fe/PDA/pages/inventory/mergePacking.vue new file mode 100644 index 000000000..0b46d7632 --- /dev/null +++ b/fe/PDA/pages/inventory/mergePacking.vue @@ -0,0 +1,476 @@ + + + + + \ No newline at end of file diff --git a/fe/PDA/pages/inventory/mergePackingResult.vue b/fe/PDA/pages/inventory/mergePackingResult.vue new file mode 100644 index 000000000..aa3782fa3 --- /dev/null +++ b/fe/PDA/pages/inventory/mergePackingResult.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/fe/PDA/pages/inventory/returnWareHouse.vue b/fe/PDA/pages/inventory/returnWareHouse.vue index 4490762ad..d634bef5d 100644 --- a/fe/PDA/pages/inventory/returnWareHouse.vue +++ b/fe/PDA/pages/inventory/returnWareHouse.vue @@ -149,7 +149,7 @@ if (value <= 0) { item.qty = item.defaultHandleQty this.$refs['comNumberBox_' + index][0].setValue(item.qty); - this.showMessage('发料数量不能小于或等于0') + this.showMessage('数量不能小于或等于0') return; } }, diff --git a/fe/PDA/pages/inventory/splitPacking.vue b/fe/PDA/pages/inventory/splitPacking.vue new file mode 100644 index 000000000..6b435d42c --- /dev/null +++ b/fe/PDA/pages/inventory/splitPacking.vue @@ -0,0 +1,580 @@ + + + + + \ No newline at end of file diff --git a/fe/PDA/pages/inventory/splitPackingResult.vue b/fe/PDA/pages/inventory/splitPackingResult.vue new file mode 100644 index 000000000..aa3782fa3 --- /dev/null +++ b/fe/PDA/pages/inventory/splitPackingResult.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/fe/PDA/static/config.json b/fe/PDA/static/config.json index d4c81c5a9..323956624 100644 --- a/fe/PDA/static/config.json +++ b/fe/PDA/static/config.json @@ -34,7 +34,7 @@ "purchaseReturnReason": "PurReturnReason", "returnBeforPutawayReason": "UnqualifiedReason", "receiptCheckReason": "UnqualifiedReason", - "returnWareHouseUrl": "/wms/api/RestJsonService/notifyOutTaskBack4FW" + "returnWareHouseUrl": "http://10.164.233.34:9192" }, "desc": { "companyCode": "公司代码",