From 41b9eec31e839be094877d8d600c033185678500 Mon Sep 17 00:00:00 2001 From: vayne Date: Mon, 24 Jun 2024 17:15:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=A3=85=E5=8D=95?= =?UTF-8?q?=E5=BD=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scm/form/purchaseReceiptVoucher/index.vue | 44 ++++++++++++++++--- .../mapper/scm/BusinessOrderMapper.xml | 16 +++---- .../mapper/scm/WarehousingOutboundMapper.xml | 4 +- .../mapper/scm/WarehousingStorageMapper.xml | 4 +- .../resources/mapper/scm/WorkOrderMapper.xml | 4 +- 5 files changed, 53 insertions(+), 19 deletions(-) diff --git a/jnpf-app/pages/scm/form/purchaseReceiptVoucher/index.vue b/jnpf-app/pages/scm/form/purchaseReceiptVoucher/index.vue index a3666345..db7155e4 100644 --- a/jnpf-app/pages/scm/form/purchaseReceiptVoucher/index.vue +++ b/jnpf-app/pages/scm/form/purchaseReceiptVoucher/index.vue @@ -174,7 +174,7 @@ + placeholder="数字文本" :step="1" :min="0" @input="UpdateWeight(dataForm.voucherProductList[i])"> @@ -182,7 +182,7 @@ + placeholder="数字文本" :step="1" :min="0" @input="UpdateWeight(dataForm.voucherProductList[i])"> @@ -190,7 +190,7 @@ + placeholder="数字文本" :step="1" :min="0" @input="UpdateWeight(dataForm.voucherProductList[i])"> @@ -198,7 +198,7 @@ + placeholder="数字文本" :step="1" :min="0"> @@ -206,7 +206,7 @@ + placeholder="数字文本" :step="1" :min="0"> @@ -1127,6 +1127,40 @@ if (!!this.exist()) return this.$u.toast( this.exist() ) + var flag = false + _data.voucherProductList.forEach(e => { + var tareWeight = e.tareWeight;//皮重 + var grossWeight = e.grossWeight;//毛重 + var buckleWeight = e.buckleWeight;//扣重 + var netWeight = e.netWeight;//净重 + if (grossWeight < this.jnpf.floatAdd(this.jnpf.floatAdd(tareWeight, buckleWeight), netWeight)) { + uni.showToast({ + title: '毛重不得小于皮重+扣重+净重', + icon: 'none' + }) + flag = true + return + } + if (buckleWeight >= netWeight) { + uni.showToast({ + title: '扣重不得大于净重', + icon: 'none' + }) + flag = true + return + } + if (buckleWeight >= grossWeight) { + uni.showToast({ + title: '扣重不得大于毛重', + icon: 'none' + }) + flag = true + return + } + }) + if(flag){ + return + } this.btnLoading = true if (this.dataForm.id) { request({ diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml index 5c3d8329..8ec099a9 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml @@ -874,10 +874,10 @@ a.f_creator_user_id as CREATE_EMP_ID, a.f_creator_time as CREATE_DTM, 'N' as READ_FLAG, - '' as READ_TIME, + null as READ_TIME, '' as ERR_MESSAGE, 'N' as ESB_STATUS, - '' as ESB_DTM, + null as ESB_DTM, '' as ESB_MESSAGE, count(h.id) as LINE_SUM FROM @@ -923,10 +923,10 @@ f.delv_tol_min as DELV_TOL_MIN, 'B' AS ORD_STATUS, 'N' as READ_FLAG, - '' as READ_TIME, + null as READ_TIME, '' as ERR_MESSAGE, 'N' as ESB_STATUS, - '' as ESB_DTM, + null as ESB_DTM, '' as ESB_MESSAGE, g.f_en_code AS DEPT_CD, g.f_full_name AS DEPT_NM, @@ -1024,10 +1024,10 @@ a.remark as REMARKS, 'B' as ORD_STS, 'N' as READ_FLAG, - '' as READ_TIME, + null as READ_TIME, '' as ERR_MESSAGE, 'N' as ESB_STATUS, - '' as ESB_DTM, + null as ESB_DTM, '' as ESB_MESSAGE, '' as TRADE_CLS, '' as REP_ADS, @@ -1083,10 +1083,10 @@ a.f_creator_time as CREATE_DTM, '0' as CANCLE_YN, 'N' as READ_FLAG, - '' as READ_TIME, + null as READ_TIME, '' as ERR_MESSAGE, 'N' as ESB_STATUS, - '' as ESB_DTM, + null as ESB_DTM, '' as ESB_MESSAGE FROM jg_business_order a diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml index 141c203c..64e9da12 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml @@ -144,10 +144,10 @@ '0' as CANCLE_YN, '1' as OUT_TYPE, 'N' as READ_FLAG, - '' as READ_TIME, + null as READ_TIME, '' as ERR_MESSAGE, 'N' as ESB_STATUS, - '' as ESB_DTM, + null as ESB_DTM, '' as ESB_MESSAGE, IF(a.warehousing_outbound_type = 1,n.ord_ln,o.ord_ln) as SAL_LINE, aa.batch_number as BATCH_ID diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml index fbdf268c..566344f2 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml @@ -403,10 +403,10 @@ g.f_real_name AS STO_EMP_ID, a.warehousing_time AS STO_DTM, 'N' as READ_FLAG, - '' as READ_TIME, + null as READ_TIME, '' as ERR_MESSAGE, 'N' as ESB_STATUS, - '' as ESB_DTM, + null as ESB_DTM, '' as ESB_MESSAGE FROM jg_warehousing_storage a diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml index e509a545..12f92b49 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml @@ -152,10 +152,10 @@ h.f_real_name as CREATE_EMP_ID, a.f_creator_time as CREATE_DTM, 'N' as READ_FLAG, - '' as READ_TIME, + null as READ_TIME, '' as ERR_MESSAGE, 'N' as ESB_STATUS, - '' as ESB_DTM, + null as ESB_DTM, '' as ESB_MESSAGE from jg_work_order a left join jg_work_order_product b on a.id = b.work_id and b.f_delete_mark is null