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

div:压制工单修改

Browse Source
This commit is contained in:
Niky
2024-01-12 21:49:09 +08:00
parent bf79d1f77f
commit 2110d24a99
4 changed files with 61 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/PdmBdWorkorder.java
View File

@@ -174,4 +174,14 @@ public class PdmBdWorkorder implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private String pack_method; private String pack_method;
@TableField(exist = false)
private String order_number;
@TableField(exist = false)
private String product_code;
@TableField(exist = false)
private String material_model;
} }

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml
View File

@@ -6,7 +6,9 @@
,ma.material_name ,ma.material_name
,ma.material_code ,ma.material_code
,ma.material_spec ,ma.material_spec
,ma.half_material_code ,ma.order_number
,ma.product_code
,ma.material_model
FROM pdm_bd_workorder wo FROM pdm_bd_workorder wo
LEFT JOIN md_base_material ma ON ma.material_id = wo.material_id LEFT JOIN md_base_material ma ON ma.material_id = wo.material_id
<where> <where>

65
lms/nladmin-ui/src/views/wms/pdm/workerorder/pressedOrder.vue
View File

@@ -164,18 +164,27 @@
<el-form-item label="物料名称" prop="material_name"> <el-form-item label="物料名称" prop="material_name">
<el-input v-model="form.material_name" style="width: 240px;" @focus="getMaterial(1)"/> <el-input v-model="form.material_name" style="width: 240px;" @focus="getMaterial(1)"/>
</el-form-item> </el-form-item>
<el-form-item label="物料编码"> <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.product_code" style="width: 240px;" disabled />
</el-form-item>
<el-form-item label="产品牌号">
<el-input v-model="form.material_code" style="width: 240px;" disabled/> <el-input v-model="form.material_code" style="width: 240px;" disabled/>
</el-form-item> </el-form-item>
<el-form-item label="物料规格"> <el-form-item label="产品部位">
<el-input v-model="form.material_spec" style="width: 240px;" disabled/> <el-input v-model="form.material_spec" style="width: 240px;" disabled/>
</el-form-item> </el-form-item>
<el-form-item label="半成品编码" prop="material_name"> <el-form-item label="物料型号">
<el-input v-model="form.half_material_code" style="width: 240px;" disabled/> <el-input v-model="form.material_model" 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>
<!-- <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 label="新料比例" v-if="form.region_code === 'YZ'"> <el-form-item label="新料比例" v-if="form.region_code === 'YZ'">
<el-input-number <el-input-number
v-model.number="form.material_ratio" v-model.number="form.material_ratio"
@@ -356,31 +365,34 @@
/> />
<el-table-column prop="point_code" label="设备编码" :min-width="flexWidth('point_code',crud.data,'设备编码')" /> <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="point_name" label="设备名称" :min-width="flexWidth('point_name',crud.data,'设备名称')" />
<el-table-column <el-table-column prop="order_number" label="订单编号" :min-width="flexWidth('order_number',crud.data,'订单编号')" />
prop="material_code" <el-table-column prop="product_code" label="产品编码" :min-width="flexWidth('product_code',crud.data,'产品编码')" />
label="成品编码" <!-- <el-table-column-->
:min-width="flexWidth('material_name',crud.data,'物料标识')" <!-- prop="material_code"-->
/> <!-- label="物料名称"-->
<el-table-column <!-- :min-width="flexWidth('material_name',crud.data,'物料名称')"-->
prop="half_material_code" <!-- />-->
label="半成品编码" <!-- <el-table-column-->
:min-width="flexWidth('half_material_code',crud.data,'半成品编码')" <!-- prop="half_material_code"-->
/> <!-- label="半成品编码"-->
<!-- :min-width="flexWidth('half_material_code',crud.data,'半成品编码')"-->
<!-- />-->
<el-table-column <el-table-column
prop="raw_material_code" prop="raw_material_code"
label="泥料编码" label="物料名称"
:min-width="flexWidth('raw_material_code',crud.data,'物料标识')" :min-width="flexWidth('raw_material_code',crud.data,'物料名称')"
/> />
<el-table-column <el-table-column
prop="material_name" prop="material_name"
label="物料名称" label="产品牌号"
:min-width="flexWidth('material_name',crud.data,'物料标识')" :min-width="flexWidth('material_name',crud.data,'产品牌号')"
/> />
<el-table-column <el-table-column
prop="material_spec" prop="material_spec"
label="物料规格" label="产品部位"
:min-width="flexWidth('material_spec',crud.data,'物料标识')" :min-width="flexWidth('material_spec',crud.data,'产品部位')"
/> />
<el-table-column prop="material_model" label="物料型号" :min-width="flexWidth('material_model',crud.data,'物料型号')" />
<el-table-column <el-table-column
prop="vehicle_type" prop="vehicle_type"
label="载具类型" label="载具类型"
@@ -641,8 +653,11 @@ export default {
this.form.material_id = row.material_id this.form.material_id = row.material_id
this.form.material_spec = row.material_spec this.form.material_spec = row.material_spec
this.form.material_code = row.material_code this.form.material_code = row.material_code
this.form.half_material_code = row.half_material_code // this.form.half_material_code = row.half_material_code
this.form.raw_material_code = row.raw_material_code // this.form.raw_material_code = row.raw_material_code
this.form.order_number = row.order_number
this.form.product_code = row.product_code
this.form.material_model = row.material_model
} else { } else {
this.form.raw_material_name = row.material_name this.form.raw_material_name = row.material_name
this.form.raw_material_id = row.material_id this.form.raw_material_id = row.material_id

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

@@ -23,7 +23,7 @@
@keyup.enter.native="crud.toQuery" @keyup.enter.native="crud.toQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物料规格"> <el-form-item label="产品部位">
<el-input <el-input
v-model="query.material_spec" v-model="query.material_spec"
clearable clearable
@@ -67,11 +67,13 @@
<el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio> <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="material_code" label="物料编码" width="160" /> <el-table-column prop="order_number" label="订单编号" width="160"/>
<el-table-column prop="half_material_code" label="半成品编码" width="160" /> <el-table-column prop="product_code" label="产品编码" width="160" />
<el-table-column prop="raw_material_code" label="泥料编码" width="160" /> <el-table-column prop="material_code" label="物料名称" width="160" />
<el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip /> <!-- <el-table-column prop="half_material_code" label="半成品编码" width="160" />-->
<el-table-column prop="material_spec" label="物料规格" width="140" /> <!-- <el-table-column prop="raw_material_code" label="泥料编码" width="160" />-->
<el-table-column prop="material_name" label="产品牌号" width="180" show-overflow-tooltip />
<el-table-column prop="material_spec" label="产品部位" width="140" />
<el-table-column prop="material_model" label="物料型号" width="140" /> <el-table-column prop="material_model" label="物料型号" width="140" />
<el-table-column prop="pack_method" label="包装方式" width="140" /> <el-table-column prop="pack_method" label="包装方式" width="140" />
<el-table-column v-if="queryInfo === '库存顺序'" prop="total_material_qty" label="物料总数/块" width="140" /> <el-table-column v-if="queryInfo === '库存顺序'" prop="total_material_qty" label="物料总数/块" width="140" />