Compare commits

...

2 Commits

  1. 12
      src/mycomponents/detail/comRecommendDetailCard.vue
  2. 24
      src/pages/inventoryMove/job/inventoryMoveDetail.vue

12
src/mycomponents/detail/comRecommendDetailCard.vue

@ -140,14 +140,20 @@
}, },
mounted() { mounted() {
if (this.scanOptions.length == 0) {
this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, false)
}
if(import.meta.env.VITE_MANAGE_MODEL=="BY_PACKAGING"){
if (this.detailOptions.length == 0) { if (this.detailOptions.length == 0) {
this.detailOptions = getDetailOption(); this.detailOptions = getDetailOption();
} }
if (this.scanOptions.length == 0) { }else {
this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, false) this.scanOptions.splice(0,1)
} }
// this.showLocation();
}, },
methods: { methods: {

24
src/pages/inventoryMove/job/inventoryMoveDetail.vue

@ -14,8 +14,7 @@
<view class=""> <view class="">
<comInventoryDetailCard :dataContent="item" :settingParam="jobContent" @remove="updateData" <comInventoryDetailCard :dataContent="item" :settingParam="jobContent" @remove="updateData"
@updateData='updateData' :locationAreaTypeList="toLocationAreaTypeList" @updateData='updateData' :locationAreaTypeList="toLocationAreaTypeList"
:allowEditQty ="jobContent.allowModifyQty=='TRUE'?true:false" :allowEditQty="jobContent.allowModifyQty=='TRUE'?true:false" @openDetail="openDetail">
@openDetail="openDetail">
</comInventoryDetailCard> </comInventoryDetailCard>
</view> </view>
</view> </view>
@ -250,7 +249,8 @@
getManagementPrecisions(itemCodes, this.toLocationCode, res => { getManagementPrecisions(itemCodes, this.toLocationCode, res => {
if (res.success) { if (res.success) {
this.managementList = res.list; this.managementList = res.list;
this.managementType = this.managementList.some(item => item.ManagementPrecision == this.managementType = this.managementList.some(item => item
.ManagementPrecision ==
'BY_BATCH') ? 'BY_BATCH' : '' 'BY_BATCH') ? 'BY_BATCH' : ''
} }
}) })
@ -483,7 +483,9 @@
await getPrecisionStrategyList(precisionStrategParams, res => { await getPrecisionStrategyList(precisionStrategParams, res => {
if (res.success) { if (res.success) {
this.managementList = res.list; this.managementList = res.list;
this.managementType = this.managementList&& this.managementList[0]&& this.managementList[0].ManagementPrecision ? this.managementList[0].ManagementPrecision : 'BY_PACKAGING' this.managementType = this.managementList && this.managementList[0] && this
.managementList[0].ManagementPrecision ? this.managementList[0]
.ManagementPrecision : 'BY_PACKAGING'
console.log(11, this.managementType) console.log(11, this.managementType)
} else { } else {
uni.hideLoading(); uni.hideLoading();
@ -560,13 +562,18 @@
} else { } else {
tempHandleQty = 0 tempHandleQty = 0
} }
str += var batchHint = cur.batch ? `批次【${cur.batch}` : ``
`物料号【${item.itemCode}】批次【${cur.batch}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致\n` str += `物料号【${item.itemCode}` + `${batchHint}` +
`提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致\n`
if (cur.handleQty > cur.balance.balanceQty) { if (cur.handleQty > cur.balance.balanceQty) {
str1 += str1 += `物料号【${item.itemCode}` + `${batchHint}` +
`物料号【${item.itemCode}】批次【${cur.batch}提交数量【${ cur.handleQty}】不可以大于库存数量【${cur.balance.balanceQty}` `提交数量【${ cur.handleQty}】不可以大于库存数量【${cur.balance.balanceQty}`
} }
} }
} else {
var batchHint = cur.batch ? `批次【${cur.batch}` : ``
str += `物料号【${item.itemCode}` + `${batchHint}` +
`提交数量【0】与任务物料数量【${cur.qty}】不一致\n`
} }
}) })
}) })
@ -592,6 +599,7 @@
}); });
var params = this.setParams() var params = this.setParams()
console.log("提交" + JSON.stringify(params)) console.log("提交" + JSON.stringify(params))
return;
inventoryMoveSubmit(params).then(res => { inventoryMoveSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {

Loading…
Cancel
Save