From 7f1f0aa4032ccddc48543c344f7f31328413ce86 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 4 Nov 2024 11:03:33 +0800 Subject: [PATCH 01/24] =?UTF-8?q?YT-650=E5=8F=91=E6=96=99=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E6=89=AB=E4=B8=8D=E5=9C=A8=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=EF=BC=8C=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=B8=A6=E5=87=BA=EF=BC=8C=E5=BA=94=E5=B8=A6?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/job/issueDetailBatch.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/pages/issue/job/issueDetailBatch.vue b/src/pages/issue/job/issueDetailBatch.vue index 346ed891..53061a4a 100644 --- a/src/pages/issue/job/issueDetailBatch.vue +++ b/src/pages/issue/job/issueDetailBatch.vue @@ -222,6 +222,7 @@ that.subList = res.data.subList; that.detailSource = getThreeDataSource(that.jobContent) that.jobContent.detailToLocationCode = res.data.subList[0].toLocationCode + that.toLocationCode= res.data.subList[0].toLocationCode that.fromLocationCode = that.subList[0].fromLocationCode //任务中已经扫描，模拟扫描赋值 if (this.scanMessage) { @@ -263,9 +264,7 @@ this.managementType = managementTypeParams if(managementTypeParams == "BY_BATCH" ||managementTypeParams == "BY_QUANTITY" ){ this.setDataBatch(result) - }else{ - this.setData(result) - } + } }, setDataBatch(result) { try { @@ -312,10 +311,11 @@ if (isExit == undefined) { // this.showErrorMessage("批次【" + batch + "】库位【" + result // .fromLocationCode + "】不在列表中") - + console.log(this.toLocationCode) detail.subList.push({ scaned:true, fromLocationCode:this.fromLocationCode, + toLocationCode:this.toLocationCode, batch:result.label.batch, handleQty:result.label.qty, qty:result.balance.qty, @@ -400,7 +400,9 @@ itemDetail.balanceQty=result.balance.qty itemDetail.uom=result.balance.uom itemDetail.packQty=result.package.packQty - itemDetail.packUnit=result.package.packUnit + itemDetail.packUnit=result.package.packUnit + itemDetail.fromlocationCode=this.fromLocationCode + itemDetail.toLocationCode=this.toLocationCode // itemDetail.toInventoryStatus = "OK" // itemDetail.packList.forEach(pac => { // pac.scaned = true From 5433a593d2004c4fa5b01b5546e6c1a9f675b1ba Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 4 Nov 2024 11:05:45 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E5=8E=BB=E6=8E=89console?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/job/issueDetailBatch.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/issue/job/issueDetailBatch.vue b/src/pages/issue/job/issueDetailBatch.vue index 53061a4a..97568dad 100644 --- a/src/pages/issue/job/issueDetailBatch.vue +++ b/src/pages/issue/job/issueDetailBatch.vue @@ -229,7 +229,6 @@ this.openScanPopupSimulate(this.scanMessage); } - setTimeout(r => { that.resizeCollapse(); }, 100) @@ -311,7 +310,6 @@ if (isExit == undefined) { // this.showErrorMessage("批次【" + batch + "】库位【" + result // .fromLocationCode + "】不在列表中") - console.log(this.toLocationCode) detail.subList.push({ scaned:true, fromLocationCode:this.fromLocationCode, From 97f11f2a374caddc972626ec193ff05b14670960 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 4 Nov 2024 13:29:41 +0800 Subject: [PATCH 03/24] =?UTF-8?q?YT-658=E9=9A=94=E7=A6=BB=E8=BD=AC?= =?UTF-8?q?=E5=90=88=E6=A0=BC=EF=BC=8Cpda=E6=89=AB=E6=8F=8F=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=B2=A1=E6=9C=89=E5=BA=93=E5=AD=98=EF=BC=8C=E5=AE=9E?= =?UTF-8?q?=E9=99=85=E6=9C=89=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/balance.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/balance.js b/src/common/balance.js index 8ddae8f2..d6f9b4a8 100644 --- a/src/common/balance.js +++ b/src/common/balance.js @@ -397,13 +397,13 @@ export function byQuantity(label, locationCode, fromInventoryStatuses, callback) }) filters.push({ column: "packingNumber", - action: "==", - value: null + action: "isStr", + value: '' }) filters.push({ column: "batch", - action: "==", - value: label.batch?label.batch:null + action: "isStr", + value:'' }) filters.push({ column: "locationCode", From aa39a85d77e08bac470a7967762bdbae8e7f90a0 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 4 Nov 2024 13:31:07 +0800 Subject: [PATCH 04/24] =?UTF-8?q?YT-658=E9=9A=94=E7=A6=BB=E8=BD=AC?= =?UTF-8?q?=E5=90=88=E6=A0=BC=EF=BC=8Cpda=E6=89=AB=E6=8F=8F=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=B2=A1=E6=9C=89=E5=BA=93=E5=AD=98=EF=BC=8C=E5=AE=9E?= =?UTF-8?q?=E9=99=85=E6=9C=89=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/inventoryMove/job/inventoryMoveDetail.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue index 7c91522e..f64936b9 100644 --- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue +++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue @@ -314,7 +314,7 @@ getScanResult(result,managementPrecision) { - if(managementPrecision == 'BY_BATCH'){ + if(managementPrecision == 'BY_BATCH' || managementPrecision == 'BY_QUANTITY' ){ this.setDataBatch(result,managementPrecision) }else{ this.setData(result,managementPrecision) @@ -577,6 +577,7 @@ }); var params = this.setParams() console.log("提交" + JSON.stringify(params)) + return; inventoryMoveSubmit(params).then(res => { uni.hideLoading() if (res.data) { From 8a6af2052af8d30ce3297fc7d6622fe295fe7fbe Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 4 Nov 2024 13:36:29 +0800 Subject: [PATCH 05/24] =?UTF-8?q?YT-656=E5=BA=93=E5=AD=98=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=EF=BC=8Cpda=E6=8F=90=E7=A4=BA=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/inventoryMove/job/inventoryMoveDetail.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue index f64936b9..3787576e 100644 --- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue +++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue @@ -491,9 +491,9 @@ //扫描数量和任务数量相等，直接提交 if (this.scanCount == this.subList.length) { if(this.managementType == 'BY_BATCH'){ - this.checkCount(); - }else{ this.checkCountBatch(); + }else{ + this.checkCount(); } } else if (this.scanCount < this.subList.length) { //扫描数量小于任务数量，判断是否允许部分提交 @@ -577,7 +577,6 @@ }); var params = this.setParams() console.log("提交" + JSON.stringify(params)) - return; inventoryMoveSubmit(params).then(res => { uni.hideLoading() if (res.data) { From 3ab2758be54f683488315306c74006c4e5919843 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 4 Nov 2024 15:16:39 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E5=90=88=E6=A0=BC=E8=BD=AC=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 2 +- .../inventoryMove/coms/okToHoldRecordPack.vue | 146 ++++++++ .../inventoryMove/coms/okToHoldRecordScan.vue | 327 ------------------ .../record/okToQuarantineRecord.vue | 35 ++ 4 files changed, 182 insertions(+), 328 deletions(-) create mode 100644 src/pages/inventoryMove/coms/okToHoldRecordPack.vue delete mode 100644 src/pages/inventoryMove/coms/okToHoldRecordScan.vue create mode 100644 src/pages/inventoryMove/record/okToQuarantineRecord.vue diff --git a/src/pages.json b/src/pages.json index 32a54c13..45d58c18 100644 --- a/src/pages.json +++ b/src/pages.json @@ -2214,7 +2214,7 @@ } }, { - "path": "pages/inventoryMove/record/okToHoldRecord", + "path": "pages/inventoryMove/record/okToQuarantineRecord", "style": { "navigationBarTitleText": "合格转隔离记录", "enablePullDownRefresh": false diff --git a/src/pages/inventoryMove/coms/okToHoldRecordPack.vue b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue new file mode 100644 index 00000000..07416065 --- /dev/null +++ b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue @@ -0,0 +1,146 @@ + + + + + \ No newline at end of file diff --git a/src/pages/inventoryMove/coms/okToHoldRecordScan.vue b/src/pages/inventoryMove/coms/okToHoldRecordScan.vue deleted file mode 100644 index 73acab6f..00000000 --- a/src/pages/inventoryMove/coms/okToHoldRecordScan.vue +++ /dev/null @@ -1,327 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/inventoryMove/record/okToQuarantineRecord.vue b/src/pages/inventoryMove/record/okToQuarantineRecord.vue new file mode 100644 index 00000000..3ff2250d --- /dev/null +++ b/src/pages/inventoryMove/record/okToQuarantineRecord.vue @@ -0,0 +1,35 @@ + + + + + From 346b7f9e7ce2bbaa8a0827dd2003818fe457edb5 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 4 Nov 2024 15:39:10 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E7=82=B9=E4=B8=8D=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/pages.json b/src/pages.json index 45d58c18..8c6a03a4 100644 --- a/src/pages.json +++ b/src/pages.json @@ -2577,6 +2577,13 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/unPlanned/record/receiptRecordByBatch", + "style": { + "navigationBarTitleText": "计划外入库记录", + "enablePullDownRefresh": false + } + }, { "path": "pages/unPlanned/record/issueRecord", "style": { From e75a91fc99c94c82f84066dd4134c54d4ead6b10 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Wed, 6 Nov 2024 07:08:57 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 ++--- .env.hella13 | 14 ------------ .env.hella14 | 14 ------------ .env.hella15 | 14 ------------ .env.hella16 | 14 ------------ .env.hella8 | 15 ------------- .env.hella9 | 14 ------------ .env.production | 11 +++++----- .env.test | 12 +++++----- .env.test-dev | 15 +++++++++++++ Dockerfile_prod | 7 ------ nginx.conf | 21 ++++++++++++++++++ nginx_prod.conf | 57 ------------------------------------------------ package.json | 19 ++++++---------- 14 files changed, 58 insertions(+), 175 deletions(-) delete mode 100644 .env.hella13 delete mode 100644 .env.hella14 delete mode 100644 .env.hella15 delete mode 100644 .env.hella16 delete mode 100644 .env.hella8 delete mode 100644 .env.hella9 create mode 100644 .env.test-dev delete mode 100644 Dockerfile_prod delete mode 100644 nginx_prod.conf diff --git a/.env.development b/.env.development index faacbb33..4e262404 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ -# VITE_BASE_URL=http://localhost:12080/admin-api -VITE_BASE_URL=http://dev.ccwin-in.com:28051/api/admin-api -VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api +VITE_BASE_URL=http://localhost:12080/admin-api +# VITE_BASE_URL=http://dev.ccwin-in.com:28051/api/admin-api +# VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api # 租户配置 VITE_TENANT='[{"text":"英泰","value":1},{"text":"长春2379","value":3}]' diff --git a/.env.hella13 b/.env.hella13 deleted file mode 100644 index 97e83b15..00000000 --- a/.env.hella13 +++ /dev/null @@ -1,14 +0,0 @@ -VITE_BASE_URL=http://172.21.32.13:81/api/admin-api -VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api - -# 租户配置 -VITE_TENANT='[{"text":"长春1379","value":1}]' - -# 是否是测试环境 -VITE_isDevelopment=false - -# 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://172.21.32.13:90' - -# 项目管理模式 批次货/包装 -VITE_MANAGE_MODEL="BY_BATCH" \ No newline at end of file diff --git a/.env.hella14 b/.env.hella14 deleted file mode 100644 index 441178e5..00000000 --- a/.env.hella14 +++ /dev/null @@ -1,14 +0,0 @@ -VITE_BASE_URL=http://172.21.32.14:81/api/admin-api -VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api - -# 租户配置 -VITE_TENANT='[{"text":"长春1379","value":1}]' - -# 是否是测试环境 -VITE_isDevelopment=true - -# 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://172.21.32.14:90' - -# 项目管理模式 批次货/包装 -VITE_MANAGE_MODEL="BY_BATCH" \ No newline at end of file diff --git a/.env.hella15 b/.env.hella15 deleted file mode 100644 index f7c9ff07..00000000 --- a/.env.hella15 +++ /dev/null @@ -1,14 +0,0 @@ -VITE_BASE_URL=https://scp.faway-hella.com:81/api/admin-api -VITE_BASE_URL_IMAGE=https://scp.faway-hella.com:81/admin-api - -# 租户配置 -VITE_TENANT='[{"text":"长春1379","value":1}]' - -# 是否是测试环境 -VITE_isDevelopment=true - -# 积木报表请求路径 -VITE_JMREPORT_BASE_URL='https://scp.faway-hella.com' - -# 项目管理模式 批次货/包装 -VITE_MANAGE_MODEL="BY_BATCH" \ No newline at end of file diff --git a/.env.hella16 b/.env.hella16 deleted file mode 100644 index c84efd8f..00000000 --- a/.env.hella16 +++ /dev/null @@ -1,14 +0,0 @@ -VITE_BASE_URL=https://scptest.faway-hella.com:81/api/admin-api -VITE_BASE_URL_IMAGE=https://scptest.faway-hella.com:81/admin-api - -# 租户配置 -VITE_TENANT='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' - -# 是否是测试环境 -VITE_isDevelopment=true - -# 积木报表请求路径 -VITE_JMREPORT_BASE_URL='https://scptest.faway-hella.com' - -# 项目管理模式 批次货/包装 -VITE_MANAGE_MODEL="BY_BATCH" \ No newline at end of file diff --git a/.env.hella8 b/.env.hella8 deleted file mode 100644 index 8851bd7c..00000000 --- a/.env.hella8 +++ /dev/null @@ -1,15 +0,0 @@ -VITE_BASE_URL=http://172.22.32.8:81/api/admin-api -VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api - -# 租户配置 -VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' - -# 是否是测试环境 -VITE_isDevelopment=false - - -# 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://172.22.32.8:90' - -# 项目管理模式 批次货/包装 -VITE_MANAGE_MODEL="BY_BATCH" \ No newline at end of file diff --git a/.env.hella9 b/.env.hella9 deleted file mode 100644 index 36f3d239..00000000 --- a/.env.hella9 +++ /dev/null @@ -1,14 +0,0 @@ -VITE_BASE_URL=http://172.22.32.9:81/api/admin-api -VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api - -# 租户配置 -VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' - -# 是否是测试环境 -VITE_isDevelopment=true - -# 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://172.22.32.9:90' - -# 项目管理模式 批次货/包装 -VITE_MANAGE_MODEL="BY_BATCH" \ No newline at end of file diff --git a/.env.production b/.env.production index 49336718..a3d9c20b 100644 --- a/.env.production +++ b/.env.production @@ -1,15 +1,14 @@ -VITE_BASE_URL=http://172.22.32.8:81/api/admin-api -VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api +VITE_BASE_URL=http://192.168.120.34:81/api/admin-api +VITE_BASE_URL_IMAGE=http://192.168.120.34:81/admin-api # 租户配置 -VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' +VITE_TENANT='[{"text":"英泰","value":1}]' # 是否是测试环境 -VITE_isDevelopment=false - +VITE_isDevelopment=true # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://172.22.32.8:90' +VITE_JMREPORT_BASE_URL='http://192.168.120.34:81/api' # 项目管理模式 批次货/包装 VITE_MANAGE_MODEL="BY_BATCH" \ No newline at end of file diff --git a/.env.test b/.env.test index 16293197..b3c1ab1b 100644 --- a/.env.test +++ b/.env.test @@ -1,12 +1,14 @@ - -VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api -VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/admin-api +VITE_BASE_URL=http://192.168.120.35:81/api/admin-api +VITE_BASE_URL_IMAGE=http://192.168.120.35:81/admin-api # 租户配置 -VITE_TENANT='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' +VITE_TENANT='[{"text":"英泰","value":1}]' # 是否是测试环境 VITE_isDevelopment=true # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310' +VITE_JMREPORT_BASE_URL='http://192.168.120.35:81/api' + +# 项目管理模式 批次货/包装 +VITE_MANAGE_MODEL="BY_BATCH" \ No newline at end of file diff --git a/.env.test-dev b/.env.test-dev new file mode 100644 index 00000000..024ae336 --- /dev/null +++ b/.env.test-dev @@ -0,0 +1,15 @@ +VITE_BASE_URL=http://dev.ccwin-in.com:28051/api/admin-api +VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:28051/admin-api + +# 租户配置 +VITE_TENANT='[{"text":"英泰","value":1}]' + +# 是否是测试环境 +VITE_isDevelopment=false + + +# 积木报表请求路径 +VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:28051' + +# 项目管理模式 批次货/包装 +VITE_MANAGE_MODEL="BY_BATCH" \ No newline at end of file diff --git a/Dockerfile_prod b/Dockerfile_prod deleted file mode 100644 index 116cbdac..00000000 --- a/Dockerfile_prod +++ /dev/null @@ -1,7 +0,0 @@ -# 设置基础镜像 -FROM win-nginx - -WORKDIR /opt/sfms3.0-uniapp -COPY nginx_prod.conf /usr/local/nginx/conf/nginx.conf -# 将dist/build/h5/文件中的内容复制到 /opt/sfms3.0-uniapp 这个目录下面 -COPY dist/build/h5/ /opt/sfms3.0-uniapp diff --git a/nginx.conf b/nginx.conf index 2b8d1e32..02896bfc 100644 --- a/nginx.conf +++ b/nginx.conf @@ -41,6 +41,27 @@ http { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $http_x_forwarded_for; } + location ^~ /jmreport/ { + proxy_pass http://localhost:100/jmreport/; + proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header; + proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $http_x_forwarded_for; + } + location ^~ /magic/ { + proxy_pass http://localhost:100/magic/; + proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header; + proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $http_x_forwarded_for; + } + location /profile/ { + proxy_cache my_zone; + proxy_cache_valid 200 304 12h; + proxy_cache_key $host$uri$is_args$args; + alias /opt/profile/; + index index.html index.htm; + } location / { proxy_cache my_zone; proxy_cache_valid 200 304 12h; diff --git a/nginx_prod.conf b/nginx_prod.conf deleted file mode 100644 index 2f9b3691..00000000 --- a/nginx_prod.conf +++ /dev/null @@ -1,57 +0,0 @@ -user root; -worker_processes 2; - -events { - worker_connections 1024; -} - -http { - include mime.types; - charset utf-8,gbk; - default_type application/octet-stream; - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for" "$request_time $upstream_response_time"'; - - proxy_cache_path /opt/nginx_cache/ levels=1:2 keys_zone=my_zone:10m inactive=300s max_size=5g; - access_log logs/access.log main; - sendfile on; - #tcp_nopush on; - keepalive_timeout 600s; - client_max_body_size 200m; - gzip on; - gzip_min_length 10k; - gzip_comp_level 9; - gzip_buffers 4 16k; - gzip_types text/plain application/javascript text/css application/xml text/javascript image/jpeg image/gif image/png; - gzip_vary on; - gzip_disable "MSIE [1-6]\."; - upstream sfms3.0 { - server localhost:90 weight=10 max_fails=3 fail_timeout=10s; - } - server { - listen 81; - server_name_in_redirect off; - server_name _; - location /api/ { - proxy_pass http://sfms3.0/; - proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header; - proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $http_x_forwarded_for; - } - location /profile/ { - alias /opt/profile/; - index index.html index.htm; - } - location / { - proxy_cache my_zone; - proxy_cache_valid 200 304 12h; - proxy_cache_key $host$uri$is_args$args; - try_files $uri $uri/ /index.html; - root /opt/sfms3.0-uniapp; - index index.html index.htm; - } - } -} \ No newline at end of file diff --git a/package.json b/package.json index 0d932a24..c4d16606 100644 --- a/package.json +++ b/package.json @@ -8,19 +8,14 @@ "dev": "uni", "dev:h5:ssr": "uni --ssr", "dev:mp-weixin": "uni -p mp-weixin", - "hella8:app": "uni build -p app --mode hella8", - "hella8:app-android": "uni build -p app-android --mode hella8", - "hella8:app-ios": "uni build -p app-ios --mode hella8", - "hella8:h5:ssr": "uni build --ssr --mode hella8", - "hella8:mp-weixin": "uni build -p mp-weixin --mode hella8", - "prod": "uni build --mode production", + "test:app": "uni build -p app --mode test", + "test:app-android": "uni build -p app-android --mode test", + "test:app-ios": "uni build -p app-ios --mode test", + "test:h5:ssr": "uni build --ssr --mode test", + "test:mp-weixin": "uni build -p mp-weixin --mode test", + "prod": "uni build --mode production", "test": "uni build --mode test", - "hella8": "uni build --mode hella8", - "hella9": "uni build --mode hella9", - "hella13": "uni build --mode hella13", - "hella14": "uni build --mode hella14", - "hella15": "uni build --mode hella15", - "hella16": "uni build --mode hella16" + "test-dev": "uni build --mode test-dev" }, "dependencies": { "@dcloudio/uni-app": "3.0.0-3090920231225001", From 180b83685cb12b3d2255f81c966973a0ec1620c0 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 6 Nov 2024 09:31:22 +0800 Subject: [PATCH 09/24] =?UTF-8?q?YT-686=E6=89=AB=E6=8F=8F=E7=AE=B1?= =?UTF-8?q?=E7=A0=81=E6=95=B0=E9=87=8F=E4=B8=8E=E4=BB=BB=E5=8A=A1=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E4=B8=8D=E4=B8=80=E8=87=B4=E6=97=B6=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=97=B6=E6=8F=90=E7=A4=BA=E5=8E=BB=E6=8E=89=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E5=8F=B7YT-687=E9=9A=94=E7=A6=BB=E8=BD=AC=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=EF=BC=8C=E8=B6=85=E5=87=BA=E5=BA=93=E5=AD=98=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E5=8F=AF=E4=BB=A5=E6=8F=90=E4=BA=A4=EF=BC=8C=E5=BA=94?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryMove/job/inventoryMoveDetail.vue | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue index 3787576e..185e2220 100644 --- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue +++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue @@ -314,6 +314,7 @@ getScanResult(result,managementPrecision) { + this.managementType = managementPrecision if(managementPrecision == 'BY_BATCH' || managementPrecision == 'BY_QUANTITY' ){ this.setDataBatch(result,managementPrecision) }else{ @@ -322,6 +323,7 @@ }, setDataBatch(result,managementPrecision){ + console.log(877,result.balance.qty) try { var packingNumber = result.label.packingNumber; var batch = result.label.batch; @@ -482,6 +484,7 @@ if (res.success) { this.managementList = res.list; this.managementType = this.managementList&& this.managementList[0]&& this.managementList[0].ManagementPrecision ? this.managementList[0].ManagementPrecision : 'BY_PACKAGING' + console.log(11,this.managementType) } else { uni.hideLoading(); this.showErrorMessage(res.message); @@ -490,7 +493,7 @@ //允许部分提交 //扫描数量和任务数量相等，直接提交 if (this.scanCount == this.subList.length) { - if(this.managementType == 'BY_BATCH'){ + if(this.managementType == 'BY_BATCH' || this.managementType == 'BY_QUANTITY'){ this.checkCountBatch(); }else{ this.checkCount(); @@ -545,6 +548,7 @@ checkCountBatch(){ // 提交的数量和任务数量不一致提示 let str = '' + let str1 = '' this.detailSource.forEach((item) => { item.subList.forEach(cur => { if (cur.qty != cur.handleQty) { @@ -556,9 +560,19 @@ } str += `提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致\n` + if( cur.handleQty > cur.balance.balanceQty){ + console.log(2333,cur.handleQty) + console.log(2333,cur.balance.balanceQty) + str1 += + `提交数量【${ cur.handleQty}】不可以大于库存数量【${cur.balance.balanceQty}】` + } } }) }) + if(str1){ + this.$refs.comMessage.showConfirmWarningModal(str1) + return + } if (str) { str = '任务明细未全部完成,是否提交?\n' + str this.$refs.comMessage.showQuestionMessage1(str, 'red', res => { @@ -577,6 +591,7 @@ }); var params = this.setParams() console.log("提交" + JSON.stringify(params)) + return inventoryMoveSubmit(params).then(res => { uni.hideLoading() if (res.data) { From a930ccc876e523bdd699eb928486ae557dfbba0d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 6 Nov 2024 09:34:52 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=E5=8E=BB=E6=8E=89return?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/inventoryMove/job/inventoryMoveDetail.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue index 185e2220..f90e341a 100644 --- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue +++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue @@ -591,7 +591,6 @@ }); var params = this.setParams() console.log("提交" + JSON.stringify(params)) - return inventoryMoveSubmit(params).then(res => { uni.hideLoading() if (res.data) { From 204d493184956af8531b53da41c3557c5675bbe8 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 6 Nov 2024 09:37:38 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=E5=90=88=E6=A0=BC=E8=BD=AC=E9=9A=94?= =?UTF-8?q?=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 7 + .../inventoryMove/coms/comMoveRecord.vue | 122 +++++++++++++++++- .../inventoryMove/coms/okToHoldRecordPack.vue | 94 ++++++++++---- .../inventoryMove/record/okToHoldRecord.vue | 2 +- .../record/okToQuarantineRecord.vue | 15 +-- 5 files changed, 201 insertions(+), 39 deletions(-) diff --git a/src/pages.json b/src/pages.json index 8c6a03a4..65ae2f48 100644 --- a/src/pages.json +++ b/src/pages.json @@ -2213,6 +2213,13 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/inventoryMove/record/okToHoldRecord", + "style": { + "navigationBarTitleText": "物料隔离记录", + "enablePullDownRefresh": false + } + }, { "path": "pages/inventoryMove/record/okToQuarantineRecord", "style": { diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index 47038b41..4f130f8a 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -34,6 +34,8 @@ + + { + if (res.itemCode == balance.itemCode) { + return res + } + }) + if (item == undefined) { + var itemp = createItemInfo(balance, pack); + let newDetail = createDetailInfo(balance, pack); + + if (newDetail.packingNumber == '') { + newDetail.packingNumber = pack.number; + } + if (this.businessTypeCode == "Move") { + newDetail.toInventoryStatus = balance.inventoryStatus; + } else { + newDetail.toInventoryStatus = this.toInventoryStatus; + } + newDetail.toLocationCode = this.toLocationCode; + newDetail.fromLocationCode = result.fromLocationCode + itemp.subList.push(newDetail); + this.detailSource.push(itemp) + } else { + if( balance.inventoryStatus != this.toInventoryStatus){ + this.showErrorMessage("库存状态的库存") + return + } + var detail = item.subList.find(r => { + if (r.batch == pack.batch && + r.fromLocationCode == balance.locationCode && + r.toInventoryStatus == balance.inventoryStatus && + r.scaned == true) { + return r; + } + }) + console.log(2333,detail) + + if (detail == undefined) { + let newDetail = createDetailInfo(balance, pack); + // newDetail.inventoryStatus = balance.inventoryStatus; + if (this.businessTypeCode == "Move") { + newDetail.toInventoryStatus = balance.inventoryStatus; + } else { + newDetail.toInventoryStatus = this.toInventoryStatus; + } + + if (newDetail.packingNumber == '') { + newDetail.packingNumber = pack.number; + } + newDetail.toLocationCode = this.toLocationCode; + newDetail.fromLocationCode = result.fromLocationCode + item.subList.push(newDetail); + } else { + detail.handleQty =calc.add(detail.handleQty, result.label.qty) + } + } + calcHandleQty(this.detailSource); + }, + showErrorMessage(message) { if (this.$refs.scanPopup) { this.$refs.scanPopup.packLoseFocus() diff --git a/src/pages/inventoryMove/coms/okToHoldRecordPack.vue b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue index 07416065..03b52c4c 100644 --- a/src/pages/inventoryMove/coms/okToHoldRecordPack.vue +++ b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue @@ -1,6 +1,6 @@ @@ -54,36 +57,76 @@ components: { winScanLocation }, + emits: ["showFromLocationPopup",'itemCodeClick','confirm','fromLocationBlur'], data() { return { show:true, - businessTypeCode: "OkToHold", + handleQty:0, + fromLocationCode:'', + itemCode:'', + batch:'', } }, props: { + fromLocationCodeProps:{ + type: String, + default: '' + }, + // 是否显示第一层弹窗 + showOnePop: { + type: Boolean, + default: false + }, + itemCodeProps:{ + type: String, + default: '' + }, + batchProps:{ + type: String, + default: '' + }, + }, + mounted() { }, methods: { // 打开扫描来源库位组件 - openFromLocation(){ - this.$refs.scanLocationCode.openScanPopup() + fromLocationClick(){ + // this.$refs.scanLocationCode.openScanPopup() + this.$emit("showFromLocationPopup"); + }, + // 显示箱码 + itemCodeClick(){ + // this.$refs.scanLocationCode.openScanPopup() + this.$emit("itemCodeClick"); }, - getLocation(location, code){ - console.log(location,code) + confirm(){ + // this.$refs.scanLocationCode.openScanPopup() + let obj = { + fromLocationCode:this.fromLocationCode, + itemCode:this.itemCode, + batch:this.batch, + handleQty:this.handleQty, + } + this.$emit("confirm",obj); }, - getBusinessTypeFunc() { - getBusinessType(this.businessTypeCode, res => { - if (res.success) { - this.businessType = res.businessType; - this.fromInventoryStatuses = res.fromInventoryStatuses.split(','); - this.fromLocationAreaTypeList = res.fromLocationAreaTypeList - this.openFromLocation(); - } else { - this.showErrorMessage(res.message) - } - }); + fromLocationBlur(){ + // this.$refs.scanLocationCode.openScanPopup() + console.log(this.fromLocationCode) + this.$emit("fromLocationBlur"); + }, + }, + watch: { + fromLocationCodeProps(newVal) { + console.log(newVal) + this.fromLocationCode = newVal + }, + itemCodeProps(newVal) { + this.itemCode = newVal + }, + batchProps(newVal) { + this.batch = newVal }, - } } @@ -122,6 +165,10 @@ width: 0px; height: 80rpx; border: 1px solid #dedede; + display: flex; + align-items: center; + font-size: 32rpx; + padding: 0px 20rpx; } .value1{ flex:1; @@ -129,6 +176,7 @@ height: 80rpx; display: flex; align-items: center; + font-size: 32rpx; } .searchIcon{ width: 40rpx; diff --git a/src/pages/inventoryMove/record/okToHoldRecord.vue b/src/pages/inventoryMove/record/okToHoldRecord.vue index e025da9a..a086b2bd 100644 --- a/src/pages/inventoryMove/record/okToHoldRecord.vue +++ b/src/pages/inventoryMove/record/okToHoldRecord.vue @@ -1,6 +1,6 @@ diff --git a/src/pages/inventoryMove/record/okToQuarantineRecord.vue b/src/pages/inventoryMove/record/okToQuarantineRecord.vue index 3ff2250d..4cd14afc 100644 --- a/src/pages/inventoryMove/record/okToQuarantineRecord.vue +++ b/src/pages/inventoryMove/record/okToQuarantineRecord.vue @@ -1,28 +1,25 @@ - - From 70fce459b78e1c926935ec3b1f5f2cadebc519ac Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 6 Nov 2024 10:33:15 +0800 Subject: [PATCH 13/24] =?UTF-8?q?YT-704=E9=A2=84=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=EF=BC=8Cpda=E6=8F=90=E4=BA=A4=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E4=B8=8E=E4=BB=BB=E5=8A=A1=E4=B8=8D=E4=B8=80=E8=87=B4?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=8E=BB=E6=8E=89=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/productReceiptDetail.vue | 64 +++++++++++++++++-- 1 file changed, 57 insertions(+), 7 deletions(-) diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue index 2a34cef8..d6e62376 100644 --- a/src/pages/productReceipt/job/productReceiptDetail.vue +++ b/src/pages/productReceipt/job/productReceiptDetail.vue @@ -361,7 +361,7 @@ }); }, - commit() { + async commit() { this.scanCount = getScanCount(this.subList); if (this.scanCount == 0) { this.showErrorMessage("扫描数为0,请先扫描") @@ -376,18 +376,40 @@ }else{ this.toLocationCode = this.jobToLocationCode } + //获取管理模式，封装参数 + var itemCodes = [] + this.detailSource.forEach(item => { + itemCodes.push(item.itemCode) + }) + await getManagementPrecisions(itemCodes, this.toLocationCode, res => { + if (res.success) { + this.managementList = res.list; + this.managementType = this.managementList&& this.managementList[0]&& this.managementList[0].ManagementPrecision ? this.managementList[0].ManagementPrecision : 'BY_PACKAGING' + } + }) //扫描数量和任务数量相等，直接提交 if (this.scanCount == this.subList.length) { - if (this.checkCount()) { - this.submitJob(); + if(this.managementType == 'BY_BATCH' || this.managementType == 'BY_QUANTITY'){ + if (this.checkCountBatch()) { + this.submitJob(); + } + }else{ + if (this.checkCount()) { + this.submitJob(); + } } - } else if (this.scanCount < this.subList.length) { //扫描数量小于任务数量，判断是否允许部分提交 if (this.jobContent.allowPartialComplete == "TRUE") { //提交 - if (this.checkCount()) { - this.submitJob(); + if(this.managementType == 'BY_BATCH' || this.managementType == 'BY_QUANTITY'){ + if (this.checkCountBatch()) { + this.submitJob(); + } + }else{ + if (this.checkCount()) { + this.submitJob(); + } } } else { //不允许部分提交，提示 @@ -425,7 +447,34 @@ return isCheck; }, - + checkCountBatch(){ + var isCheck = true; + var hint = "" + for (var i = 0; i < this.detailSource.length; i++) { + var item = this.detailSource[i]; + for (var j = 0; j < item.subList.length; j++) { + var subItem = item.subList[i] + console.log(calc.sub(subItem.handleQty, subItem.qty) ) + if (calc.sub(subItem.handleQty, subItem.qty) < 0 || calc.sub(subItem.handleQty, subItem.qty) > 0) { + isCheck = false; + hint = "批次【" + subItem.batch + "】实际收货数量:[" + subItem.handleQty + "]与包装数量[" + subItem.qty + + "]不相等，是否继续收货?" + break + } + + } + } + console.log(isCheck) + if (!isCheck) { + this.showQuestMessage(hint, res => { + if (res) { + this.submitJob(); + } + }) + } + + return isCheck; + }, submitJob() { uni.showLoading({ title: "提交中....", @@ -435,6 +484,7 @@ this.detailSource.forEach(item => { itemCodes.push(item.itemCode) }) + return getManagementPrecisions(itemCodes, this.toLocationCode, res => { if (res.success) { this.managementList = res.list; From d5912434dd6cf8433b675531b5f9124a77994698 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 6 Nov 2024 11:17:49 +0800 Subject: [PATCH 14/24] =?UTF-8?q?=E5=8E=BB=E6=8E=89batch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/inventoryMove/coms/okToHoldRecordPack.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/inventoryMove/coms/okToHoldRecordPack.vue b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue index 03b52c4c..056991c0 100644 --- a/src/pages/inventoryMove/coms/okToHoldRecordPack.vue +++ b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue @@ -24,7 +24,7 @@ 批次： - + From 17972344ce2609b662666f368e58de738622c046 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 6 Nov 2024 11:18:17 +0800 Subject: [PATCH 15/24] =?UTF-8?q?=E6=89=B9=E6=AC=A1=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/inventoryMove/job/inventoryMoveDetail.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue index f90e341a..5aafc125 100644 --- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue +++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue @@ -559,12 +559,12 @@ tempHandleQty = 0 } str += - `提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致\n` + `批次【${cur.batch}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致\n` if( cur.handleQty > cur.balance.balanceQty){ console.log(2333,cur.handleQty) console.log(2333,cur.balance.balanceQty) str1 += - `提交数量【${ cur.handleQty}】不可以大于库存数量【${cur.balance.balanceQty}】` + `批次【${cur.batch}】提交数量【${ cur.handleQty}】不可以大于库存数量【${cur.balance.balanceQty}】` } } }) From bd67d81b080723d594862ec8505bb55f6df584d5 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 6 Nov 2024 11:42:05 +0800 Subject: [PATCH 16/24] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/inventoryMove/coms/okToHoldRecordPack.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/inventoryMove/coms/okToHoldRecordPack.vue b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue index 056991c0..7d620871 100644 --- a/src/pages/inventoryMove/coms/okToHoldRecordPack.vue +++ b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue @@ -1,6 +1,6 @@