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

fix:修改分拣工单

Browse Source
This commit is contained in:
Niky
2024-01-18 14:54:22 +08:00
parent b104b83279
commit 86ae1646fb
3 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialQuery.java
View File

@@ -13,4 +13,5 @@ public class MdBaseMaterialQuery implements Serializable {
private String blurry;
private String material_spec;
private String material_model;
private String material_code;
}

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml
View File

@@ -19,7 +19,6 @@
`sch_base_point` p
LEFT JOIN sch_base_vehiclematerialgroup vg ON p.vehicle_code = vg.vehicle_code
AND p.vehicle_type = vg.vehicle_type AND vg.group_bind_material_status = '2'
LEFT JOIN pdm_bd_workorder w ON w.workorder_code = vg.workorder_code
WHERE (p.ing_task_code = '' OR p.ing_task_code IS NULL) AND p.point_status = '3'
AND vg.group_id IS NOT NULL AND vg.material_id = #{materialId}
AND p.region_code IN

72
lms/nladmin-ui/src/views/wms/pdm/workerorder/sortedOrder.vue
View File

@@ -163,18 +163,28 @@
<el-form-item label="物料名称" prop="material_name">
<el-input v-model="form.material_name" style="width: 240px;" @focus="getMaterial(1)" />
</el-form-item>
<el-form-item label="物料编码">
<el-input v-model="form.material_code" style="width: 240px;" disabled />
<el-form-item label="订单编号">
<el-input v-model="form.order_number" style="width: 240px;" disabled />
</el-form-item>
<el-form-item label="物料规格">
<el-input v-model="form.material_spec" style="width: 240px;" disabled />
<el-form-item label="产品编码">
<el-input v-model="form.product_code" style="width: 240px;" disabled />
</el-form-item>
<el-form-item label="半成品编码" prop="material_name">
<el-input v-model="form.half_material_code" style="width: 240px;" disabled />
<el-form-item label="产品牌号">
<el-input v-model="form.material_code" style="width: 240px;" disabled/>
</el-form-item>
<el-form-item label="原料编码">
<el-input v-model="form.raw_material_code" style="width: 240px;" disabled />
<el-form-item label="产品部位">
<el-input v-model="form.material_spec" style="width: 240px;" disabled/>
</el-form-item>
<el-form-item label="物料型号">
<el-input v-model="form.material_model" style="width: 240px;" disabled/>
</el-form-item>
<!-- <el-form-item label="半成品编码" prop="material_name">-->
<!-- <el-input v-model="form.half_material_code" style="width: 240px;" disabled />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="原料编码">-->
<!-- <el-input v-model="form.raw_material_code" style="width: 240px;" disabled />-->
<!-- </el-form-item>-->
<el-form-item v-if="form.region_code === 'HN' || form.region_code === 'YZ'" label="计划重量" prop="plan_weight">
<el-input-number
v-model.number="form.plan_weight"
@@ -354,31 +364,35 @@
/>
<el-table-column prop="point_code" label="设备编码" :min-width="flexWidth('point_code',crud.data,'设备编码')" />
<el-table-column prop="point_name" label="设备名称" :min-width="flexWidth('point_name',crud.data,'设备名称')" />
<el-table-column
prop="material_code"
label="成品编码"
:min-width="flexWidth('material_name',crud.data,'物料标识')"
/>
<el-table-column
prop="half_material_code"
label="半成品编码"
:min-width="flexWidth('half_material_code',crud.data,'半成品编码')"
/>
<el-table-column
prop="raw_material_code"
label="泥料编码"
:min-width="flexWidth('raw_material_code',crud.data,'物料标识')"
/>
<el-table-column prop="order_number" label="订单编号" :min-width="flexWidth('order_number',crud.data,'订单编号')" />
<el-table-column prop="product_code" label="产品编码" :min-width="flexWidth('product_code',crud.data,'产品编码')" />
<!-- <el-table-column-->
<!-- prop="half_material_code"-->
<!-- label="半成品编码"-->
<!-- :min-width="flexWidth('half_material_code',crud.data,'半成品编码')"-->
<!-- />-->
<!-- <el-table-column-->
<!-- prop="raw_material_code"-->
<!-- label="泥料编码"-->
<!-- :min-width="flexWidth('raw_material_code',crud.data,'物料标识')"-->
<!-- />-->
<el-table-column
prop="material_name"
label="物料名称"
:min-width="flexWidth('material_name',crud.data,'物料标识')"
/>
<el-table-column
prop="material_spec"
label="物料规格"
:min-width="flexWidth('material_spec',crud.data,'物料标识')"
prop="material_code"
label="产品牌号"
:min-width="flexWidth('material_code',crud.data,'产品牌号')"
/>
<el-table-column
prop="material_spec"
label="产品部位"
:min-width="flexWidth('material_spec',crud.data,'产品部位')"
/>
<el-table-column prop="material_model" label="物料型号" :min-width="flexWidth('material_model',crud.data,'物料型号')" />
<el-table-column
prop="vehicle_type"
label="载具类型"
@@ -634,9 +648,9 @@ export default {
this.form.material_id = row.material_id
this.form.material_spec = row.material_spec
this.form.material_code = row.material_code
this.form.half_material_code = row.half_material_code
this.form.raw_material_code = row.raw_material_code
this.form.pack_method = row.pack_method
this.form.order_number = row.order_number
this.form.product_code = row.product_code
this.form.material_model = row.material_model
const result = Object.keys(this.dict.label.vehicle_type).find(key => this.dict.label.vehicle_type[key] === row.pack_palletspec)
if (result) {
this.form.vehicle_type = result