diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/WorkProcedureService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/WorkProcedureService.java index 202ab059..4f45c8bc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/WorkProcedureService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/WorkProcedureService.java @@ -38,7 +38,7 @@ public interface WorkProcedureService { * @param workProcedure_id ID * @return WorkProcedure */ - WorkProcedureDto findById(Long workProcedure_id); + WorkProcedureDto findById(String workProcedure_id); /** * 根据编码查询 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/dto/WorkProcedureDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/dto/WorkProcedureDto.java index 9b1d83a8..e4492f8a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/dto/WorkProcedureDto.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/dto/WorkProcedureDto.java @@ -17,11 +17,11 @@ import java.util.Date; @Data public class WorkProcedureDto implements Serializable { - /** 工序标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long workprocedure_id; + private String workprocedure_id; + + /** 生产区域 */ + private String product_area; /** 工序编码 */ private String workprocedure_code; @@ -56,9 +56,6 @@ public class WorkProcedureDto implements Serializable { /** 创建时间 */ private String create_time; - /** 是否删除 */ - private String is_delete; - /** 修改人 */ private String update_id; @@ -67,10 +64,5 @@ public class WorkProcedureDto implements Serializable { /** 修改时间 */ private String update_time; - - /** 外部标识 */ - private String ext_id; - - } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WorkProcedureServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WorkProcedureServiceImpl.java index c8466fe9..46b5002d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WorkProcedureServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WorkProcedureServiceImpl.java @@ -47,10 +47,14 @@ public class WorkProcedureServiceImpl implements WorkProcedureService { String where = ""; WQLObject wo = WQLObject.getWQLObject("pdm_bi_workprocedure"); String search = (String) whereJson.get("search"); + String product_area = (String) whereJson.get("product_area"); if (!StrUtil.isEmpty(search)) { - where = " AND (workprocedure_code like '%" + search + "%' OR workprocedure_name like '%" + search + "%' ) "; + where += " AND (workprocedure_code like '%" + search + "%' OR workprocedure_name like '%" + search + "%' )"; } - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "is_delete= '0' " + where, "workprocedure_code"); + if(!StrUtil.isEmpty(product_area)) { + where += " AND product_area = '" + product_area + "'"; + } + ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "is_used = '1' " + where, "workprocedure_code"); final JSONObject json = rb.pageResult(); return json; } @@ -64,7 +68,7 @@ public class WorkProcedureServiceImpl implements WorkProcedureService { } @Override - public WorkProcedureDto findById(Long workProcedure_id) { + public WorkProcedureDto findById(String workProcedure_id) { WQLObject wo = WQLObject.getWQLObject("pdm_bi_workProcedure"); JSONObject json = wo.query("workProcedure_id =" + workProcedure_id + "").uniqueResult(0); if (ObjectUtil.isEmpty(json)) return null; @@ -92,7 +96,7 @@ public class WorkProcedureServiceImpl implements WorkProcedureService { String currentUserId = currentUser.getId(); String nickName = SecurityUtils.getCurrentNickName(); - dto.setWorkprocedure_id(IdUtil.getSnowflake(1, 1).nextId()); + dto.setWorkprocedure_id(IdUtil.getSnowflake(1, 1).nextIdStr()); dto.setCreate_id(currentUserId); dto.setCreate_name(nickName); dto.setUpdate_id(currentUserId); @@ -152,7 +156,7 @@ public class WorkProcedureServiceImpl implements WorkProcedureService { public JSONArray downSelect() { //工序表【PDM_BI_WorkProcedure】 WQLObject workProcedureTab = WQLObject.getWQLObject("PDM_BI_WorkProcedure"); - JSONArray resultJSONArray = workProcedureTab.query("is_delete = '0' and is_used ='1'", "workprocedure_code").getResultJSONArray(0); + JSONArray resultJSONArray = workProcedureTab.query("is_used ='1'", "workprocedure_code").getResultJSONArray(0); return resultJSONArray; } @@ -160,7 +164,7 @@ public class WorkProcedureServiceImpl implements WorkProcedureService { public List queryWorkprocedure() { WQLObject wo = WQLObject.getWQLObject("pdm_bi_workprocedure"); //只查清洗 跟仓储 - JSONArray arr = wo.query(" is_delete = '0' and workprocedure_code in ('12','08')").getResultJSONArray(0); + JSONArray arr = wo.query(" is_used = '1' and workprocedure_code in ('12','08')").getResultJSONArray(0); if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(WorkprocedureDto.class); return null; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Personcorrdevice001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Personcorrdevice001.wql index 1230bf0d..3fde74cd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Personcorrdevice001.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Personcorrdevice001.wql @@ -54,7 +54,7 @@ PDM_BI_PersonCorrDevice personDevice LEFT JOIN sys_user user ON personDevice.jockey_id = user.user_id WHERE - user.enabled = '1' + user.is_used = '1' GROUP BY personDevice.jockey_id ) view_person diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index 1670c505..15fb68ef 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ diff --git a/mes/qd/src/views/wms/basedata/pdm/workProcedure/index.vue b/mes/qd/src/views/wms/basedata/pdm/workProcedure/index.vue index 79044698..81d7d74b 100644 --- a/mes/qd/src/views/wms/basedata/pdm/workProcedure/index.vue +++ b/mes/qd/src/views/wms/basedata/pdm/workProcedure/index.vue @@ -2,17 +2,43 @@
+ + + + + + + + + + + - - + + + + + @@ -149,12 +189,27 @@ import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' const defaultForm = { - workprocedure_id: null, workprocedure_code: null, workprocedure_name: null, worksection_type_scode: null, burst_type_scode: null, is_keyworkprocedure: '1', is_first: '1', is_used: '1', remark: null, create_id: null, create_name: null, create_time: null, is_delete: null, update_optid: null, update_optname: null, update_time: null, ext_id: null, sysdeptid: null, syscompanyid: null + workprocedure_id: null, + product_area: null, + workprocedure_code: null, + workprocedure_name: null, + worksection_type_scode: null, + burst_type_scode: null, + is_keyworkprocedure: '1', + is_first: '1', + is_used: '1', + remark: null, + create_id: null, + create_name: null, + create_time: null, + update_id: null, + update_name: null, + update_time: null } export default { name: 'WorkProcedure', components: { pagination, crudOperation, rrOperation, udOperation }, - dicts: ['PDM_BI_SECTION', 'PDM_BI_BURSTTYPE'], + dicts: ['PDM_BI_SECTION', 'PDM_BI_BURSTTYPE', 'product_area'], mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ @@ -163,6 +218,9 @@ export default { idField: 'workprocedure_id', sort: 'workprocedure_id,desc', crudMethod: { ...crudWorkProcedure }, + query: { + product_area: 'A1' + }, optShow: { add: true, edit: true,