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

add:增加混碾货架->拆包机任务下发、压机上料位强制回货架、人工分拣 出窑缓存货架->人工分拣位、人工分拣送空盘接口；

Browse Source 
fix:拆包机->混碾货架任务下发接口修改，修改组盘管理、点位管理页面和查询接口
This commit is contained in:
songxiaopeng
2024-03-28 14:58:55 +08:00
parent 53c13b2885
commit 174436aec0
25 changed files with 497 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lms/nladmin-ui/src/views/wms/pdm/workerorder/mixedOrder.vue
View File

@@ -108,7 +108,7 @@
</el-button>
</crudOperation>
<el-dialog
title="填写条码"
title="填写信息"
:visible.sync="dialogVisible"
width="30%">
<el-form
@@ -122,6 +122,14 @@
<el-form-item label="条码">
<el-input v-model="barcodeForm.barcode" />
</el-form-item>
<el-form-item label="时间">
<el-date-picker
v-model="barcodeForm.createTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="info" @click="dialogCancle">取消</el-button>
@@ -283,7 +291,7 @@
<el-form-item label="静置时间(分钟)" prop="standing_time" v-if="form.region_code === 'HN'">
<el-input-number
v-model.number="form.standing_time"
:min="0"
:min="1"
:max="999"
style="width: 240px;"
/>
@@ -694,7 +702,8 @@ export default {
this.fullscreenLoading = true
let param = {
orderCode:this.orderCode,
barCode:this.barcodeForm.barcode
barCode:this.barcodeForm.barcode,
createTime:this.barcodeForm.createTime
}
crudPdmBdWorkorder.hnmlTask(param).then(res => {
this.crud.notify('任务下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)

14
lms/nladmin-ui/src/views/wms/sch/group/index.vue
View File

@@ -175,12 +175,15 @@
<el-form-item label="物料名称">
<el-input v-model="form.material_name" clearable style="width: 240px;" @clear="clearMaterial" @focus="getMaterial" />
</el-form-item>
<el-form-item label="物料编码">
<el-form-item label="产品牌号">
<el-input v-model="form.material_code" disabled style="width: 240px;" />
</el-form-item>
<el-form-item label="物料规格">
<el-form-item label="产品部位">
<el-input v-model="form.material_spec" disabled style="width: 240px;" />
</el-form-item>
<el-form-item label="物料型号">
<el-input v-model="form.material_model" disabled style="width: 240px;" />
</el-form-item>
<el-form-item label="组盘次数">
<el-input v-model="form.group_number" style="width: 240px;" />
</el-form-item>
@@ -296,8 +299,9 @@
</el-table-column>
<el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
<el-table-column prop="material_code" label="物料编码" show-overflow-tooltip :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
<el-table-column prop="material_code" label="产品牌号" show-overflow-tooltip :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
<el-table-column prop="material_spec" label="产品部位" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
<el-table-column prop="material_model" label="物料型号" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
<el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
<el-table-column prop="material_weight" label="物料重量" :min-width="flexWidth('material_weight',crud.data,'物料重量')" />
<el-table-column prop="group_number" label="组盘次数" :min-width="flexWidth('group_number',crud.data,'组盘次数')" />
@@ -469,6 +473,7 @@ export default {
this.form.material_name = row.material_name
this.form.material_id = row.material_id
this.form.material_spec = row.material_spec
this.form.material_model = row.material_model
this.form.material_code = row.material_code
this.form.redundance_material_code = row.raw_material_code
if (this.choose === '工单') {
@@ -480,6 +485,7 @@ export default {
this.form.material_id = null
this.form.material_spec = null
this.form.material_code = null
this.form.material_code = null
this.form.redundance_material_code = null
},
setPointName(data) {

4
lms/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -267,6 +267,10 @@
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
<el-table-column prop="material_code" label="产品牌号" show-overflow-tooltip :min-width="flexWidth('material_qty',crud.data,'产品牌号')" />
<el-table-column prop="material_spec" label="产品部位" :min-width="flexWidth('material_qty',crud.data,'产品部位')" />
<el-table-column prop="material_model" label="物料型号" :min-width="flexWidth('material_qty',crud.data,'物料型号')" />
<el-table-column prop="customer" label="客户名称" :min-width="flexWidth('material_qty',crud.data,'客户名称')" />
<el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
<el-table-column label="是否锁定" :min-width="flexWidth('vehicle_qty',crud.data,'是否锁定')">
<template slot-scope="scope">