root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzhiqiang
2023-01-04 17:05:47 +08:00
parent 292635cea1 d66a7bbfa8
commit cac6dc2a04
41 changed files with 1338 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
View File

@@ -117,7 +117,7 @@
<!-- <el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" />-->
<el-table-column show-overflow-tooltip prop="vbeln" label="交货单" align="center" />
<el-table-column show-overflow-tooltip prop="source_bill_code" label="源单编号" align="center" />
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
<el-table-column show-overflow-tooltip prop="width" label="幅宽" align="center" width="100" />
</el-table>
</el-card>
<div class="crud-opts2">
@@ -163,7 +163,7 @@
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<el-button
<!-- <el-button
slot="left"
class="filter-item"
type="warning"
@@ -173,6 +173,17 @@
@click="setPoint()"
>
设置站点
</el-button>-->
<el-button
slot="left"
class="filter-item"
type="warning"
icon="el-icon-check"
size="mini"
:disabled="button4"
@click="oneSetPoint"
>
设置站点
</el-button>
</span>
</div>
@@ -493,21 +504,6 @@ export default {
this.crud.notify('任务已生成！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
// 根据此仓位的 ‘相同块、相同排、相同层’ 判断上一个任务是否生成
const tab = this.tabledis
for (let i = 0; i < tab.length; i++) {
const item = tab[i]
if (this.currentDis.block_num === item.block_num && this.currentDis.row_num === item.row_num && this.currentDis.layer_num === item.layer_num) {
const out_order_seq = parseInt(this.currentDis.out_order_seq) - 1
if (parseInt(item.out_order_seq) === out_order_seq) {
if (item.work_status === '00') {
this.crud.notify('请先生成上一个任务：' + item.struct_code, CRUD.NOTIFICATION_TYPE.INFO)
return
}
}
}
}
if (this.currentDis.iostorinvdis_id !== null) {
this.currentDis.point_code = this.form2.point_code
checkoutbill.setPoint(this.currentDis).then(res => {
@@ -515,6 +511,26 @@ export default {
})
}
},
oneSetPoint() {
if (this.form2.point_code === '') {
this.crud.notify('请先选择站点！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
if (this.currentDis.point_code) {
this.crud.notify('站点已设置！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
if (this.currentDis.work_status !== '00') {
this.crud.notify('任务已生成！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
if (this.currentDis.iostorinvdis_id !== null) {
this.currentDis.point_code = this.form2.point_code
checkoutbill.oneSetPoint(this.currentDis).then(res => {
this.queryTableDdis(this.currentDis.iostorinvdtl_id)
})
}
},
queryTableDtl() {
checkoutbill.getOutBillDtl({ 'iostorinv_id': this.mstrow.iostorinv_id }).then(res => {
this.tableDtl = res

5
lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
View File

@@ -113,11 +113,14 @@
<el-table-column prop="pcsn" label="子卷号" width="150px" align="center" show-overflow-tooltip />
<el-table-column prop="sap_pcsn" label="sap批次" width="120px" align="center" show-overflow-tooltip />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column prop="assign_qty" :formatter="crud.formatNum3" label="已分配重量" align="center" width="100px" />
<el-table-column prop="unassign_qty" :formatter="crud.formatNum3" label="未分配重量" align="center" width="100px" />
<el-table-column prop="qty_unit_name" label="单位" align="center" />
<el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" />
<!-- <el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" />-->
<el-table-column prop="source_bill_code" label="源单号" align="center" width="130px" />
<el-table-column prop="vbeln" label="交货单号" align="center" width="120px" />
<el-table-column prop="posnr" label="行号" align="center" width="70px" />
<el-table-column prop="width" label="幅宽" align="center" width="110px" />
<el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
</el-table>
</el-card>

9
lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js
View File

@@ -100,6 +100,13 @@ export function setPoint(data) {
data
})
}
export function oneSetPoint(data) {
return request({
url: '/api/checkoutbill/oneSetPoint',
method: 'post',
data
})
}
export function getStructIvt(params) {
return request({
url: '/api/checkoutbill/getStructIvt',
@@ -197,4 +204,4 @@ export function getOutBillTask2(data) {
data
})
}
export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel }
export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel }

13
lms/nladmin-ui/src/views/wms/st/outbill/index.vue
View File

@@ -38,7 +38,7 @@
</el-select>
</el-form-item>
<el-form-item label="生成方式">
<!-- <el-form-item label="生成方式">
<el-select
v-model="query.create_mode"
clearable
@@ -54,7 +54,7 @@
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="单据状态">
<el-select
@@ -128,6 +128,15 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="发货幅宽">
<el-input
v-model="query.width"
size="mini"
clearable
placeholder="幅宽"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="是否回传">
<el-select
v-model="query.is_upload"