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:
周俊杰
2024-01-13 09:42:40 +08:00
parent 2110d24a99
commit 01634dd3a4
5 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java
View File

@@ -70,7 +70,7 @@ public class MdBaseMaterialServiceImpl extends ServiceImpl<MdBaseMaterialMapper,
String now = DateUtil.now();
//特殊处理，半成品编码=成品编码=物料名称
entity.setMaterial_code(entity.getMaterial_name());
// entity.setMaterial_code(entity.getMaterial_name());
entity.setHalf_material_code(entity.getMaterial_name());
entity.setMaterial_id(IdUtil.getSnowflake(1, 1).nextIdStr());

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/ResultForMes.java
View File

@@ -1,7 +1,6 @@
package org.nl.wms.ext.mes.service.dto;
import cn.hutool.http.HttpStatus;
import com.sun.org.apache.regexp.internal.RE;
import lombok.Data;
/**

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

@@ -41,9 +41,11 @@
w.point_code AS device_code,
w.plan_qty,
IF(w.region_code = 'HN',m.raw_material_code,m.half_material_code) AS material_code,
m.material_spec AS product_code,
m.product_code AS product_code,
m.material_spec AS brick_code,
m.material_model AS formula,
m.order_number AS order_number,
m.material_code AS material_code,
IF(LENGTH(m.a_long_side) > 0,m.a_long_side,0) AS a,
IF(LENGTH(m.b_short_side) > 0,m.b_short_side,0) AS b,
IF(LENGTH(m.h_height) > 0,m.h_height,0) AS h,

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

@@ -1,5 +1,6 @@
package org.nl.wms.pdm.workorder.service.dao.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
/**
@@ -21,10 +22,10 @@ public class AcsWorkOrderVo {
* 半成品物料编码 - 工单物料编码
*/
private String material_code;
/**
* 产品代号 - 规格
*/
private String product_code;
// /**
// * 产品代号 - 规格
// */
// private String product_code;
/**
* 配方 - 型号
*/
@@ -87,4 +88,15 @@ public class AcsWorkOrderVo {
*/
private String detection_error;
private String order_number;
private String product_code;
private String material_model;
}

12
lms/nladmin-ui/src/views/wms/basedata/material/index.vue
View File

@@ -71,12 +71,12 @@
<el-form-item label="产品编码" prop="product_code">
<el-input v-model="form.product_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="物料名称" prop="material_code">
<el-input v-model="form.raw_material_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="产品牌号 " prop="material_name">
<el-form-item label="物料名称" prop="material_name">
<el-input v-model="form.material_name" style="width: 240px;" />
</el-form-item>
<el-form-item label="产品牌号 " prop="material_code">
<el-input v-model="form.material_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="产品部位" prop="material_spec">
<el-input v-model="form.material_spec" style="width: 240px;" />
</el-form-item>
@@ -191,8 +191,8 @@
<el-table-column prop="half_material_code" label="半成品编码" :min-width="flexWidth('half_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="material_code" label="物料名称" :min-width="flexWidth('material_code',crud.data,'物料名称')" />
<el-table-column prop="material_name" label="产品牌号 " :min-width="flexWidth('material_name',crud.data,'产品牌号 ')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
<el-table-column 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="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />