lyd/liaoninghexing
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

add 强制完成当天也可以，查询泥料编码

Browse Source
This commit is contained in:
周俊杰
2023-11-29 13:31:49 +08:00
parent 425f35ab55
commit 80205987e9
9 changed files with 22 additions and 9 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/impl/PdmBdWorkorderServiceImpl.java
View File

@@ -309,11 +309,11 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
if (bdWorkorder == null) {
throw new BadRequestException("未找到工单号[" + workorderCode + "]的记录!");
}
if ((bdWorkorder.getWorkorder_status().equals(WorkOrderStatusEnum.ISSUED.getCode())
|| bdWorkorder.getWorkorder_status().equals(WorkOrderStatusEnum.UNPRODUCED.getCode()))
&& (ObjectUtil.isNotEmpty(entity.getProduce_date()) && entity.getProduce_date().equals(today))) {
throw new BadRequestException("工单号[" + workorderCode + "]未生产不能完成工!");
}
// if ((bdWorkorder.getWorkorder_status().equals(WorkOrderStatusEnum.ISSUED.getCode())
// || bdWorkorder.getWorkorder_status().equals(WorkOrderStatusEnum.UNPRODUCED.getCode()))
// && (ObjectUtil.isNotEmpty(entity.getProduce_date()) && entity.getProduce_date().equals(today))) {
// throw new BadRequestException("工单号[" + workorderCode + "]未生产不能完成工!");
// }
if (bdWorkorder.getWorkorder_status().equals(WorkOrderStatusEnum.COMPLETE.getCode())) {
throw new BadRequestException("工单号[" + workorderCode + "]已完工，不能重复完工!");
}

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java
View File

@@ -162,5 +162,6 @@ public class SchBaseVehiclematerialgroup implements Serializable {
private String region_name;
@TableField(exist = false)
private String group_bind_material_status_name;
@TableField(exist = false)
private String raw_material_code;
}

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml
View File

@@ -7,6 +7,7 @@
, ma.material_name
, ma.material_code
, ma.material_spec
, ma.raw_material_code
, po.region_name
FROM sch_base_vehiclematerialgroup vg
LEFT JOIN md_base_material ma ON vg.material_id = ma.material_id
@@ -34,6 +35,7 @@
, ma.material_name
, ma.material_code
, ma.material_spec
, ma.raw_material_code
, po.region_name
, sd.label AS group_bind_material_status_name
FROM sch_base_vehiclematerialgroup vg

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupDto.java
View File

@@ -128,4 +128,6 @@ public class SchBaseVehiclematerialgroupDto implements Serializable {
private String out_kiln_time;
/** 入窑时间 */
private String into_kiln_time;
/** 泥料编码 */
private String raw_material_code;
}

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java
View File

@@ -16,4 +16,5 @@ public class SchBaseVehiclematerialgroupQuery implements Serializable {
private String workshop_code;
private String region_code;
private String group_bind_material_status;
private String raw_material_code;
}

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java
View File

@@ -156,5 +156,6 @@ public class SchBasePoint implements Serializable {
private String material_spec;
@TableField(exist = false)
private String material_model;
@TableField(exist = false)
private String raw_material_code;
}

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml
View File

@@ -35,7 +35,8 @@
IF(LENGTH(mm.material_code)>0,mm.material_code,'-') AS material_code,
IF(LENGTH(mm.material_name)>0,mm.material_name,'-') AS material_name,
IF(LENGTH(mm.material_spec)>0,mm.material_spec,'-') AS material_spec,
IF(LENGTH(mm.material_model)>0,mm.material_model,'-') AS material_model
IF(LENGTH(mm.material_model)>0,mm.material_model,'-') AS material_model,
IF(LENGTH(mm.raw_material_code)>0,mm.raw_material_code,'-') AS raw_material_code
FROM
`sch_base_point` p
LEFT JOIN sch_base_vehiclematerialgroup vg ON vg.vehicle_code = p.vehicle_code

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

@@ -163,6 +163,9 @@
<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.raw_material_code" disabled style="width: 240px;" />
</el-form-item>
<el-form-item label="组盘次数">
<el-input v-model="form.group_number" style="width: 240px;" />
</el-form-item>

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

@@ -56,10 +56,12 @@
<el-form-item label="物料名称">
<el-input v-model="groups.material_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料规格">
<el-input v-model="groups.material_spec" style="width: 200px;"/>
</el-form-item>
<el-form-item label="泥料编码">
<el-input v-model="groups.raw_material_code" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料批次">
<el-input v-model="groups.pcsn" style="width: 200px;"/>
</el-form-item>