From b53324d8ca6030a0344590856410a80fa244583f Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Fri, 11 Jul 2025 09:52:45 +0800 Subject: [PATCH 1/7] =?UTF-8?q?add=20=E5=91=BC=E5=8F=AB=E5=A5=97=E8=BD=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 8 ++ pages/SecondPhase/slitting/CallAxis.vue | 153 ++++++++++++++++++++++++ utils/getData3.js | 11 ++ utils/mork2.js | 5 + 4 files changed, 177 insertions(+) create mode 100644 pages/SecondPhase/slitting/CallAxis.vue diff --git a/pages.json b/pages.json index 261bc32..8889165 100644 --- a/pages.json +++ b/pages.json @@ -703,6 +703,14 @@ } } + ,{ + "path" : "pages/SecondPhase/slitting/CallAxis", + "style" : + { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/SecondPhase/slitting/CallAxis.vue b/pages/SecondPhase/slitting/CallAxis.vue new file mode 100644 index 0000000..f55b123 --- /dev/null +++ b/pages/SecondPhase/slitting/CallAxis.vue @@ -0,0 +1,153 @@ + + + \ No newline at end of file diff --git a/utils/getData3.js b/utils/getData3.js index 894e1dc..1f44174 100644 --- a/utils/getData3.js +++ b/utils/getData3.js @@ -568,4 +568,15 @@ export const updatePackagePoint = (ivt, code) => request({ export const cutCacheInventory = (code, type) => request({ url:'/api/pda/slitter/cutCacheInventory', data: {point_code: code, type: type} +}) +/** + * 呼叫套轴 + */ +export const doCallTubeShaftShow = () => request({ + url:'api/pda/slitter/doCallTubeShaftShow', + data: {} +}) +export const doCallTubeShaft = (code, row) => request({ + url:'api/pda/slitter/doCallTubeShaft', + data: {device_code: code, row: row} }) \ No newline at end of file diff --git a/utils/mork2.js b/utils/mork2.js index 7e52eec..d1f9513 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -110,6 +110,7 @@ export const allAuthority = () => { {menu_id: '8', title: '空轴绑定', path: '/pages/SecondPhase/slitting/EmptyAxisBind'}, {menu_id: '8', title: '空轴退回', path: '/pages/SecondPhase/slitting/EmptyAxisReturn'}, {menu_id: '8', title: '分切暂存维护', path: '/pages/SecondPhase/slitting/CacheSave'}, + {menu_id: '8', title: '呼叫套轴', path: '/pages/SecondPhase/slitting/CallAxis'} ]}, {menu_id: '10', path: 'RF15', title: '打包间管理', sonTree: [ {menu_id: '1', title: '子卷包装解绑', path: '/pages/SecondPhase/SubRollPackUnbind'}, @@ -281,4 +282,8 @@ export const twoQueryBoxIvt = (code) => { export const showManualView = (code) => { let res = [{resource_name: 'B60FQ00003', up_or_down: '1', qzz_size: '6', status: '01', qzz_generation: '5', start_time: '2025-03-11 15:24:26'}] return res +} +export const doCallTubeShaftShow = () => { + let res = [{"workorder_id":"1850909252072378369","resource_name":"B50FQ00001","container_name":"BB3X2410280807A2","parent_container_name":"BB3X24102809","split_group":"A","up_or_down":"2","status":"0","qzz_size":"6","tube":"玻璃纤维及其制品|FRP管|6英寸|15|1700|阶梯","qzz_generation":"4","start_time":"","is_paper_ok":"1","qzzno":"","manufacture_sort":"P1"}] + return res } \ No newline at end of file From 7228eeb9ff0d5ddacfa119517f2b81f6b5926067 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Fri, 11 Jul 2025 14:05:30 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=BC=E5=8F=AB?= =?UTF-8?q?=E5=A5=97=E8=BD=B4=E3=80=81=E5=AD=90=E5=8D=B7=E8=A3=85=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/SecondPhase/production/ZjContainer.vue | 38 ++++++++++++++------ pages/SecondPhase/slitting/CallAxis.vue | 23 ++++++++---- utils/getData3.js | 8 +++-- utils/mork2.js | 4 +++ 4 files changed, 54 insertions(+), 19 deletions(-) diff --git a/pages/SecondPhase/production/ZjContainer.vue b/pages/SecondPhase/production/ZjContainer.vue index ac42e7e..9c7ef59 100644 --- a/pages/SecondPhase/production/ZjContainer.vue +++ b/pages/SecondPhase/production/ZjContainer.vue @@ -51,11 +51,11 @@ - - - + + 木箱描述 + + - @@ -129,7 +129,7 @@ import NavBar from '@/components/NavBar.vue' import SearchBox from '@/components/SearchBox.vue' import UpTop from '@/components/upTop.vue' - import {queryContainerNameBySaleOrder, queryBoxSpec, updateEntityList} from '@/utils/getData3.js' + import {queryContainerNameBySaleOrder, getSameBoxList, queryBoxSpec, updateEntityList} from '@/utils/getData3.js' export default { components: { NavBar, @@ -145,7 +145,8 @@ popData: [], show: false, disabled: false, - val2: '', + options: [], + index: '', pkId: '', pkObj: {}, paper: '', @@ -238,11 +239,28 @@ } } this.disabled = code !== '' - this.val2 = code - this._queryBoxSpec() + this._getSameBoxList(code) }, - async _queryBoxSpec () { - let res = await queryBoxSpec(this.val2) + async _getSameBoxList (e) { + let res = await getSameBoxList(e) + if (res && res.length) { + this.options = [...res] + if (this.options.length > 0) { + this.index = this.options[0].value + this._queryBoxSpec(this.index) + } + } + }, + selectChange (e) { + this.index = e + if (e) { + this._queryBoxSpec(e) + } else { + this.popData = [] + } + }, + async _queryBoxSpec (e) { + let res = await queryBoxSpec(e) if (res.code === 200) { this.popData = [...res.content] this.show = true diff --git a/pages/SecondPhase/slitting/CallAxis.vue b/pages/SecondPhase/slitting/CallAxis.vue index f55b123..79eba59 100644 --- a/pages/SecondPhase/slitting/CallAxis.vue +++ b/pages/SecondPhase/slitting/CallAxis.vue @@ -49,8 +49,9 @@ - - + + + @@ -81,7 +82,6 @@ onLoad (options) { this.title = options.title this._queryProductArea() - this._doCallTubeShaftShow() }, methods: { selectChange2(e) { @@ -103,10 +103,18 @@ }, selectChange (e) { this.index = e + if (e) { + this._doCallTubeShaftShow(e) + } else { + this.dataList = [] + } }, - async _doCallTubeShaftShow () { + async _doCallTubeShaftShow (e) { + if (!this.index) { + return + } try { - let res = await doCallTubeShaftShow() + let res = await doCallTubeShaftShow(e) if (res) { this.dataList = [...res] } else { @@ -133,8 +141,9 @@ title: res.message, icon: 'none' }) - this.clearUp() - this._doCallTubeShaftShow() + this.pkId = '' + this.pkObj = {} + this._doCallTubeShaftShow(this.index) } this.disabled = false } catch (e) { diff --git a/utils/getData3.js b/utils/getData3.js index 1f44174..bff9061 100644 --- a/utils/getData3.js +++ b/utils/getData3.js @@ -260,6 +260,10 @@ export const queryContainerNameBySaleOrder = (code) => request({ url:'api/pdmBiSubpackagerelation/queryContainerNameBySaleOrder', data: {type: '1', container_name: code} }) +export const getSameBoxList = (code) => request({ + url:'api/samebox/getSameBoxList', + data: {box_code: code} +}) export const queryBoxSpec = (code) => request({ method: 'GET', url:'api/pdmBiSubpackagerelation/queryBoxSpec', @@ -572,9 +576,9 @@ export const cutCacheInventory = (code, type) => request({ /** * 呼叫套轴 */ -export const doCallTubeShaftShow = () => request({ +export const doCallTubeShaftShow = (code) => request({ url:'api/pda/slitter/doCallTubeShaftShow', - data: {} + data: {device_code: code} }) export const doCallTubeShaft = (code, row) => request({ url:'api/pda/slitter/doCallTubeShaft', diff --git a/utils/mork2.js b/utils/mork2.js index d1f9513..38a89dc 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -211,6 +211,10 @@ export const queryContainerNameBySaleOrder = () => { } return res } +export const getSameBoxList = () => { + let res = [{text: '物料一', value: '001'}, {text: '物料a', value: '002'}, {text: '物料b', value: '003'}] + return res +} export const queryBoxSpec = () => { let res = { "totalElements": 1, From 06e9e44c8a064ba15343718fe8496ca5c218c8e0 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Fri, 11 Jul 2025 15:03:32 +0800 Subject: [PATCH 3/7] no message --- pages/SecondPhase/production/ZjContainer.vue | 19 +++++++++++----- pages/SecondPhase/slitting/CallAxis.vue | 23 ++++++++++++++++---- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/pages/SecondPhase/production/ZjContainer.vue b/pages/SecondPhase/production/ZjContainer.vue index 9c7ef59..69fb67d 100644 --- a/pages/SecondPhase/production/ZjContainer.vue +++ b/pages/SecondPhase/production/ZjContainer.vue @@ -20,9 +20,9 @@ 选择 订单号 - 客户名称 + 客户名称 子卷号 - 子卷规格 + 子卷规格 子卷重量 子管重量 木箱料号 @@ -32,9 +32,9 @@ − {{e.sale_order_name}} - {{e.customer_description}} + {{e.customer_description}} {{e.container_name}} - {{e.paper_tube_description}} + {{e.paper_tube_description}} {{e.paper_weight}} {{e.box_weight}} {{e.box_type}} @@ -65,7 +65,7 @@ 木箱规格 - 物料名称 + 物料名称 木箱长度 木箱宽度 木箱高度 @@ -76,7 +76,7 @@ {{e.material_code}} - {{e.material_name}} + {{e.material_name}} {{e.box_length}} {{e.box_width}} {{e.box_high}} @@ -257,9 +257,13 @@ this._queryBoxSpec(e) } else { this.popData = [] + this.pkId = '' + this.pkObj = {} } }, async _queryBoxSpec (e) { + this.pkId = '' + this.pkObj = {} let res = await queryBoxSpec(e) if (res.code === 200) { this.popData = [...res.content] @@ -292,6 +296,9 @@ } }, popSure () { + if (!this.pkId) { + return + } if (this.dataList.length > Number(this.pkObj.num)) { uni.showToast({ title: '子卷数量超过木箱的最大装卷数！', diff --git a/pages/SecondPhase/slitting/CallAxis.vue b/pages/SecondPhase/slitting/CallAxis.vue index 79eba59..2a86321 100644 --- a/pages/SecondPhase/slitting/CallAxis.vue +++ b/pages/SecondPhase/slitting/CallAxis.vue @@ -50,8 +50,8 @@ - - + + @@ -128,12 +128,27 @@ this.pkId = this.pkId === e.workorder_id ? '' : e.workorder_id this.pkObj = this.pkId === e.workorder_id ? e : {} }, - async _doCallTubeShaft () { - this.disabled = true + toSure () { + this.disabled = false if (!this.index || !this.pkId) { this.disabled = false return } + uni.showModal({ + title: '提示', + content: `将呼叫母卷：${this.pkObj.parent_container_name}的${this.pkObj.split_group}组的计划`, + confirmColor: '#ff6a00', + success: (res) => { + if (res.confirm) { + this._doCallTubeShaft() + } else if (res.cancel) { + this.disabled = false + } + } + }) + }, + async _doCallTubeShaft () { + this.disabled = true try { let res = await doCallTubeShaft(this.index, this.pkObj) if (res) { From 706c5b3f9bcf05e1244d6aca5a4e0cde6002ebd3 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Tue, 15 Jul 2025 10:01:17 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/SecondPhase/slitting/CallAxis.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/SecondPhase/slitting/CallAxis.vue b/pages/SecondPhase/slitting/CallAxis.vue index 2a86321..24f86e0 100644 --- a/pages/SecondPhase/slitting/CallAxis.vue +++ b/pages/SecondPhase/slitting/CallAxis.vue @@ -38,7 +38,7 @@ {{e.container_name}} {{e.parent_container_name}} {{e.split_group}} - {{e.up_or_down}} + {{['上轴', '下轴'][Number(e.up_or_down) - 1]}} {{['未呼叫', '已呼叫'][Number(e.status)]}} {{e.qzz_size}} {{e.start_time}} @@ -51,7 +51,7 @@ - + @@ -130,7 +130,7 @@ }, toSure () { this.disabled = false - if (!this.index || !this.pkId) { + if (!this.index || !this.pkId || this.pkObj.status === '1') { this.disabled = false return } From 218b8ae36ca34b771a12a5106db5b1dcfcf6feba Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Tue, 15 Jul 2025 10:07:12 +0800 Subject: [PATCH 5/7] 137 --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index c8eb0db..e2eb46d 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "海亮铜箔", "appid" : "__UNI__3A002CD", "description" : "海亮铜箔二期手持系统", - "versionName" : "1.3.6", - "versionCode" : 136, + "versionName" : "1.3.7", + "versionCode" : 137, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { From c672c0c1eec8f39cfa07ff84d7fe0b8e12ddd706 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Fri, 18 Jul 2025 13:41:06 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E6=94=BE=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/SecondPhase/point/ManPass.vue | 29 +++++++++++++++++++++++++---- utils/getData3.js | 4 ++++ utils/utils.js | 19 +++++++++++++++++++ 3 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 utils/utils.js diff --git a/pages/SecondPhase/point/ManPass.vue b/pages/SecondPhase/point/ManPass.vue index 604d153..d6dc39f 100644 --- a/pages/SecondPhase/point/ManPass.vue +++ b/pages/SecondPhase/point/ManPass.vue @@ -13,9 +13,10 @@ - - - + + + + @@ -31,7 +32,8 @@