diff --git a/mes/hd/nladmin-system/pom.xml b/mes/hd/nladmin-system/pom.xml index 99d69a25..4f78b97f 100644 --- a/mes/hd/nladmin-system/pom.xml +++ b/mes/hd/nladmin-system/pom.xml @@ -264,6 +264,22 @@ org.springframework.boot spring-boot-starter-freemarker + + + org.apache.poi + poi + 4.0.0 + + + org.apache.poi + poi-ooxml + 4.0.0 + + + org.apache.poi + poi-ooxml-schemas + 4.0.0 + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java index 4aa390f9..93b83107 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java @@ -70,6 +70,9 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService { String is_error = MapUtil.getStr(whereJson, "is_error"); String product_area = MapUtil.getStr(whereJson, "product_area"); String product_series = ""; + // 员工只能看到自己创建的工单 + String currentUserId = ""; + if (!SecurityUtils.getCurrentUsername().equals("admin")) currentUserId = SecurityUtils.getCurrentUserId(); JSONObject map = new JSONObject(); map.put("flag", "1"); //map.put("order_status", order_status); @@ -77,6 +80,7 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService { map.put("begin_time", begin_time); map.put("end_time", end_time); map.put("product_area", product_area); + map.put("current_produce_person_id", currentUserId); if (StrUtil.isNotEmpty(order_status)) { order_status = order_status.replace("[\"", "").replace("\"]", "").replace("\"", ""); } @@ -304,7 +308,7 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService { //按照列获取 param.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId()); param.put("workorder_code", CodeUtil.getNewCode("PDM_SHIFTORDER")); - param.put("macoperate_id", IdUtil.getSnowflake(1, 1).nextId()); +// param.put("macoperate_id", IdUtil.getSnowflake(1, 1).nextId()); param.put("workorder_status", WorkerOrderEnum.CREATE.getCode()); param.put("shift_type_scode", WorkerOrderEnum.DAYSHIFT.getCode()); // 默认白班 String is_error = "0"; @@ -377,12 +381,12 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService { } } if (j == 11) { - SysUser jsonUser = userService.getOne(new QueryWrapper().eq("username", SecurityUtils.getCurrentUsername())); + SysUser jsonUser = userService.getOne(new QueryWrapper().eq("username", col)); if (ObjectUtil.isEmpty(jsonUser)) { is_error = "1"; error_message = error_message + "生产人员编码不存在！"; }else { - param.put("jockey_id", jsonUser.getUserId()); + param.put("current_produce_person_id", jsonUser.getUserId()); } } if (j == 12) { @@ -404,6 +408,7 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService { } param.put("is_error", is_error); param.put("error_info", error_message); + param.put("create_type", WorkerOrderEnum.EXCELINTO.getCode()); param.put("planproducestart_date", produce_date + "07:30:00"); param.put("planproduceend_date", produce_date + "18:30:00"); param.put("create_id", currentUserId); @@ -431,13 +436,12 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService { //获取每列 JSONObject param = new JSONObject(); //按照列获取 - param.put("produceorder_id", IdUtil.getSnowflake(1, 1).nextId()); - param.put("produceorder_code", CodeUtil.getNewCode("PDM_SHIFTORDER")); - param.put("producedeviceorder_code", CodeUtil.getNewCode("PDM_SHIFTORDER")); - param.put("order_status", "00"); - param.put("order_type_scode", "01"); - param.put("produce_date", produce_date); - param.put("shift_type_scode", "02"); + param.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId()); + param.put("workorder_code", CodeUtil.getNewCode("PDM_SHIFTORDER")); +// param.put("producedeviceorder_code", CodeUtil.getNewCode("PDM_SHIFTORDER")); + param.put("workorder_status", WorkerOrderEnum.CREATE.getCode()); +// param.put("produce_date", produce_date); + param.put("shift_type_scode", WorkerOrderEnum.NIGHTSHIFT.getCode()); // 夜班 //循环每一行 col: for (int j = 0; j < list.size(); j++) { @@ -514,12 +518,12 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService { } } if (j == 11) { - SysUser jsonUser = userService.getOne(new QueryWrapper().eq("username", SecurityUtils.getCurrentUsername())); + SysUser jsonUser = userService.getOne(new QueryWrapper().eq("username", col)); if (ObjectUtil.isEmpty(jsonUser)) { is_error = "1"; error_message = error_message + "生产人员编码不存在！"; }else { - param.put("jockey_id", jsonUser.getUserId()); + param.put("current_produce_person_id", jsonUser.getUserId()); } } if (j == 12) { @@ -541,6 +545,7 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService { } param.put("is_error", is_error); param.put("error_info", error_message); + param.put("create_type", WorkerOrderEnum.EXCELINTO.getCode()); param.put("planproducestart_date", produce_date + "18:30:00"); DateTime dateTime = DateUtil.offsetDay(DateUtil.parse(produce_date), 1); param.put("planproduceend_date", DateUtil.format(dateTime,"yyyy-MM-dd") + " 07:30:00"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql index 1d9a0451..b752a82d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql @@ -30,6 +30,7 @@ 输入.workprocedure_ids TYPEAS f_string 输入.workprocedure_id TYPEAS f_string 输入.unFinish TYPEAS s_string + 输入.current_produce_person_id TYPEAS s_string 输入.device_ids TYPEAS f_string @@ -75,6 +76,9 @@ OPTION 输入.unFinish <> "" ShiftOrder.workorder_status <> '5' ENDOPTION + OPTION 输入.current_produce_person_id <> "" + ShiftOrder.current_produce_person_id = 输入.current_produce_person_id + ENDOPTION OPTION 输入.order_status <> "" find_in_set(ShiftOrder.workorder_status, 输入.order_status) ENDOPTION diff --git a/mes/qd/src/views/wms/mps/produce/index.vue b/mes/qd/src/views/wms/mps/produce/index.vue index 2fc9e338..b5ae2911 100644 --- a/mes/qd/src/views/wms/mps/produce/index.vue +++ b/mes/qd/src/views/wms/mps/produce/index.vue @@ -364,7 +364,7 @@ - + @@ -390,7 +390,7 @@ {{ dict.label.IS_OR_NOT[scope.row.is_needmove] }} - +