yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

移动端磅单录入

Browse Source
jg-waiwang-pro
vayne 4 months ago
parent 9083eb6d2f
commit 41b9eec31e
5 changed files with 53 additions and 19 deletions
Show Stats Download Patch File Download Diff File

44
jnpf-app/pages/scm/form/purchaseReceiptVoucher/index.vue
Unescape View File

@ -174,7 +174,7 @@
<u-form-item required label="毛重">
<jnpf-number-box v-model="dataForm.voucherProductList[i].grossWeight"
@change="changeData('voucherproduct-grossWeight',i)" :precision="4" :controls="true"
placeholder="数字文本" :step="1" @input="UpdateWeight(dataForm.voucherProductList[i])">
placeholder="数字文本" :step="1" :min="0" @input="UpdateWeight(dataForm.voucherProductList[i])">
</jnpf-number-box>
</u-form-item>
</view>
@ -182,7 +182,7 @@
<u-form-item required label="皮重">
<jnpf-number-box v-model="dataForm.voucherProductList[i].tareWeight"
@change="changeData('voucherproduct-tareWeight',i)" :precision="4" :controls="true"
placeholder="数字文本" :step="1" @input="UpdateWeight(dataForm.voucherProductList[i])">
placeholder="数字文本" :step="1" :min="0" @input="UpdateWeight(dataForm.voucherProductList[i])">
</jnpf-number-box>
</u-form-item>
</view>
@ -190,7 +190,7 @@
<u-form-item required label="扣重">
<jnpf-number-box v-model="dataForm.voucherProductList[i].buckleWeight"
@change="changeData('voucherproduct-buckleWeight',i)" :precision="4" :controls="true"
placeholder="数字文本" :step="1" @input="UpdateWeight(dataForm.voucherProductList[i])">
placeholder="数字文本" :step="1" :min="0" @input="UpdateWeight(dataForm.voucherProductList[i])">
</jnpf-number-box>
</u-form-item>
</view>
@ -198,7 +198,7 @@
<u-form-item required label="结算量">
<jnpf-number-box v-model="dataForm.voucherProductList[i].netWeight"
@change="changeData('voucherproduct-netWeight',i)" :precision="4" :controls="true"
placeholder="数字文本" :step="1">
placeholder="数字文本" :step="1" :min="0">
</jnpf-number-box>
</u-form-item>
</view>
@ -206,7 +206,7 @@
<u-form-item required label="净重">
<jnpf-number-box v-model="dataForm.voucherProductList[i].clearWeight"
@change="changeData('voucherproduct-clearWeight',i)" :precision="4" :controls="true"
placeholder="数字文本" :step="1">
placeholder="数字文本" :step="1" :min="0">
</jnpf-number-box>
</u-form-item>
</view>
@ -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({

16
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
Unescape View File

@ -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

4
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml
Unescape View File

@ -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

4
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml
Unescape View File

@ -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

4
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save