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

工单修改

Browse Source
This commit is contained in:
liyongde
2023-03-22 09:38:53 +08:00
parent 187a2f9b6d
commit 58623edab3
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java
View File

@@ -158,15 +158,11 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService {
public void update(ProduceWorkorderDto dto) { public void update(ProduceWorkorderDto dto) {
ProduceWorkorderDto entity = this.findById(dto.getWorkorder_id()); ProduceWorkorderDto entity = this.findById(dto.getWorkorder_id());
if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
String currentUserId = SecurityUtils.getCurrentUserId(); String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName(); String nickName = SecurityUtils.getCurrentNickName();
dto.setUpdate_time(DateUtil.now()); dto.setUpdate_time(DateUtil.now());
dto.setUpdate_id(currentUserId); dto.setUpdate_id(currentUserId);
dto.setUpdate_name(nickName); dto.setUpdate_name(nickName);
WQLObject wo = WQLObject.getWQLObject("pdm_produce_workorder"); WQLObject wo = WQLObject.getWQLObject("pdm_produce_workorder");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.update(json); wo.update(json);

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql
View File

@@ -125,7 +125,7 @@
and device.device_code not in ( and device.device_code not in (
select o.current_device_code as device_code select o.current_device_code as device_code
from PDM_produce_workOrder o from PDM_produce_workOrder o
where o.workorder_status <> '5' where o.workorder_status <> '5' and o.is_delete = '0'
) )
ENDOPTION ENDOPTION
ENDSELECT ENDSELECT

3
mes/qd/src/views/wms/mps/produce/index.vue
View File

@@ -369,7 +369,7 @@
<el-table-column prop="dq_real_qty" label="电气实际数量" width="100" show-overflow-tooltip /> <el-table-column prop="dq_real_qty" label="电气实际数量" width="100" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" width="120" show-overflow-tooltip /> <el-table-column prop="material_name" label="物料名称" width="120" show-overflow-tooltip />
<el-table-column prop="workprocedure_name" label="工序名称" width="120" show-overflow-tooltip /> <el-table-column prop="workprocedure_name" label="工序名称" width="120" show-overflow-tooltip />
<el-table-column prop="material_weight" label="物料单重" width="100" /> <el-table-column prop="material_weight" label="物料单重" width="100" :formatter="crud.formatQlNum4"/>
<el-table-column prop="planproducestart_date" label="计划开始时间" width="100" show-overflow-tooltip /> <el-table-column prop="planproducestart_date" label="计划开始时间" width="100" show-overflow-tooltip />
<el-table-column prop="planproduceend_date" label="计划结束时间" width="100" show-overflow-tooltip /> <el-table-column prop="planproduceend_date" label="计划结束时间" width="100" show-overflow-tooltip />
<el-table-column prop="realproducestart_date" label="实际开始时间" width="100" show-overflow-tooltip /> <el-table-column prop="realproducestart_date" label="实际开始时间" width="100" show-overflow-tooltip />
@@ -459,6 +459,7 @@ const defaultForm = {
person_real_qty: null, person_real_qty: null,
dq_real_qty: null, dq_real_qty: null,
material_id: null, material_id: null,
material_code: null,
material_weight: null, material_weight: null,
planproducestart_date: null, planproducestart_date: null,
planproduceend_date: null, planproduceend_date: null,