diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/ext/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/ext/acs/service/impl/AcsToWmsServiceImpl.java index 13e61175..0745cafb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -619,8 +619,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { /* * 判断确认类型，并进行相对应的操作 */ - // 投料确认： 1.1 - if (StrUtil.equals(type, "1.1")) { + // 大称投料确认： 1.1；小称投料确认：1.3 + if (StrUtil.equals(type, "1.1") || StrUtil.equals(type, "1.3")) { // 更新称重记录表上报人 JSONObject jsonDtl = dtlTab.query("formuladtl_id = '" + jsonObject.getString("formuladtl_id") + "'").uniqueResult(0); jsonWeight.put("record_optid", jsonDtl.get("start_id")); @@ -652,8 +652,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { result.put("status", "400"); result.put("message", "称重成功，自动确认失败"); } - // 投料强制确认： 1.2 - } else if (StrUtil.equals(type, "1.2")) { + // 大称投料强制确认： 1.2；小称投料强制确认：1.4 + } else if (StrUtil.equals(type, "1.2") || StrUtil.equals(type, "1.4")) { // 更新称重记录表上报人 JSONObject jsonDtl = dtlTab.query("formuladtl_id = '" + jsonObject.getString("formuladtl_id") + "'").uniqueResult(0); jsonWeight.put("record_optid", jsonDtl.get("start_id")); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java index 165f7be7..282432f6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java @@ -215,6 +215,7 @@ public class DailyplanServiceImpl implements DailyplanService { if(jret.size()>0){ JSONObject form = new JSONObject(); form.put("rows",jret); + form.put("query",whereJson); this.submit2(form); } jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN") @@ -437,12 +438,16 @@ public class DailyplanServiceImpl implements DailyplanService { } String captemplate_id = captemplate.getString("id"); JSONArray ja = form.getJSONArray("rows"); + JSONObject query = form.getJSONObject("query"); + String checked = query.getString("checked"); + if (StrUtil.isEmpty(checked)) { + checked = "false"; + } JSONObject last = MPS_BD_ProductDailyPlan.query("device_id='"+ja.getJSONObject(0).getString("device_id")+"' and status='01'","planstart_date").uniqueResult(0); if(last ==null ){ throw new BadRequestException("日计划表此分组设备的最早一个日计划为空,没有可重排数据！"); } - JSONArray ja_new = new JSONArray(); for (int i = 0; i < ja.size(); i++) { JSONObject jo = ja.getJSONObject(i); @@ -452,8 +457,21 @@ public class DailyplanServiceImpl implements DailyplanService { MPS_BD_ProductDailyPlan.delete(jo); } } + String nowstart_date = last.getString("planstart_date"); Date date = DateUtil.parse(nowstart_date); + if(checked.equals("true")){ + if (StrUtil.isNotEmpty(query.getString("nowstart_date"))) { + String nowstart_date2 = query.getString("nowstart_date").substring(0,10); + Date date2 = DateUtil.parse(nowstart_date2); + //指定日期小于最晚的日计划日期 + if(date2.getTime() >= date.getTime()){ + nowstart_date = nowstart_date2; + date = date2; + } + } + } + //当天产能是否有剩余 double pcsn_num_day = 0; @@ -474,7 +492,7 @@ public class DailyplanServiceImpl implements DailyplanService { int totalproducecapacity_qty = series.getInteger("totalproducecapacity_qty"); //第一条查数据库 if(StrUtil.isNotEmpty(nowstart_date)){ - JSONObject last2 = MPS_BD_ProductDailyPlan.query("device_id='"+jo.getString("device_id")+"'","planstart_date desc,create_time desc").uniqueResult(0); + JSONObject last2 = MPS_BD_ProductDailyPlan.query("device_id='"+jo.getString("device_id")+"' and planstart_date>='"+nowstart_date+"'","planstart_date desc,create_time desc").uniqueResult(0); String standard_mark = jo.getString("standard_mark"); if(last2 != null ){ nowstart_date = last2.getString("planstart_date"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java index deffdc4c..1c9c482e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java @@ -127,6 +127,15 @@ public class WorkOrderServiceImpl implements WorkOrdereService { json.put("create_time", now); json.put("sysdeptid", deptId); json.put("syscompanyid", deptId); + String create_mode = json.getString("create_mode"); + if("01".equals(create_mode)){ + String planstart_time = json.getString("planstart_time"); + Date date = DateUtil.parse(planstart_time); + int days = this.getDays(json.getString("material_id")); + Date planend_date = DateUtil.offsetDay(date,days-1); + String planend_time = DateUtil.formatDate(planend_date).substring(0,10); + json.put("planend_time",planend_time+" 23:59:59"); + } mstTab.insert(json); this.updatePcsn(json); } @@ -167,6 +176,15 @@ public class WorkOrderServiceImpl implements WorkOrdereService { this.updatePcsn(whereJson); } } + String create_mode = whereJson.getString("create_mode"); + if("01".equals(create_mode)){ + String planstart_time = whereJson.getString("planstart_time"); + Date date = DateUtil.parse(planstart_time); + int days = this.getDays(whereJson.getString("material_id")); + Date planend_date = DateUtil.offsetDay(date,days-1); + String planend_time = DateUtil.formatDate(planend_date).substring(0,10); + whereJson.put("planend_time",planend_time+" 23:59:59"); + } mstTab.update(whereJson); } @@ -275,11 +293,12 @@ public class WorkOrderServiceImpl implements WorkOrdereService { String factorycalendar_id = calendar.getJSONObject(0).getString("factorycalendar_id"); for (int i = 0; i < ja.size(); i++) { JSONObject jo = ja.getJSONObject(i); + JSONObject jsonMst = PDM_BI_WorkOrder.query("workorder_id ='" + jo.getString("workorder_id") + "' and is_delete = '0'").uniqueResult(0); if (jsonMst == null) { throw new BadRequestException(jo.getString("workorder_code") + "当前工令记录状态异常,操作失败！"); } - + String jo_device_id = jsonMst.getString("device_id"); JSONObject Formula = PDM_BI_Formula.query("workorder_id ='" + jo.getString("workorder_id") + "' and is_delete = '0' and is_audit='0' ").uniqueResult(0); if (Formula != null) { throw new BadRequestException(jo.getString("workorder_code") + "工令对应配方未审核,操作失败！"); @@ -376,7 +395,9 @@ public class WorkOrderServiceImpl implements WorkOrdereService { } } } - }else if("GX001".equals(workprocedure_code)){//配粉工序 + }else + //配粉工序 + if("GX001".equals(workprocedure_code)){ String planstart_date = jsonMst.getString("planstart_time").substring(0,10); String nowTime = planstart_date+" 24:00:00"; if(devices.size()>=0){ @@ -404,6 +425,12 @@ public class WorkOrderServiceImpl implements WorkOrdereService { }else{ throw new BadRequestException("未查询到满足条件的排产模板！"); } + //喷雾工序使用工令指定的设备生产工序任务 + if("GX003".equals(workprocedure_code)){ + if (StrUtil.isNotEmpty(jo_device_id)) { + jsonMst.put("device_id", jo_device_id); + } + } String planstart_date = jsonMst.getString("planstart_time").substring(0,10); String planstart_time = jsonMst.getString("planstart_time"); //设置开始时间 @@ -818,6 +845,19 @@ public class WorkOrderServiceImpl implements WorkOrdereService { return ret; } + @Transactional(rollbackFor = Exception.class) + public int getDays(String material_id) { + JSONArray ProcessRoutes = WQL.getWO("QPDM_PRODUCTPLANPROC").addParam("flag","5") + .addParam("material_code",material_id).process().getResultJSONArray(0); + int days = 0; + for(int i=0;i "" (file.device_code like 输入.device_code or @@ -331,7 +336,7 @@ WHERE mst.is_delete = '0' AND file.is_delete = '0' - AND mst.invstatus in ('03','04','05') + AND mst.invstatus in ('04') OPTION 输入.device_code <> "" (file.device_code like 输入.device_code or diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICEFAULTCAE01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICEFAULTCAE01.wql index e1e2cc4b..a2811995 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICEFAULTCAE01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICEFAULTCAE01.wql @@ -54,7 +54,9 @@ MAX(class.class_name) AS class_name, MAX(file.device_code) AS device_code, MAX(file.device_model) AS device_model, - re.devicerecord_id + re.devicerecord_id, + file.device_name, + file.extend_code FROM EM_BI_DeviceRepairRequest re LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = re.devicerecord_id @@ -106,7 +108,6 @@ pari.outsourceaskfor_optid, pari.confirm_time, pari.audit_time, - pari.product_person_name, pari.update_optname FROM EM_BI_DeviceRepairRequest re diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql index 3158c35f..4b35dfa6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql @@ -276,12 +276,12 @@ mst.invstatus WHEN '01' THEN '生成' WHEN '02' THEN '提交' - WHEN '03' THEN '开始' + WHEN '03' THEN '维修开始' WHEN '04' THEN '委外维修' WHEN '05' THEN '委外验收' - WHEN '06' THEN '结束' - WHEN '07' THEN '确认' - WHEN '99' THEN '审核' + WHEN '06' THEN '维修结束' + WHEN '07' THEN '班组确认' + WHEN '99' THEN '审核完毕' END ) AS invstatus, mst.real_start_date, @@ -332,12 +332,12 @@ CASE mst.invstatus WHEN '01' THEN '生成' WHEN '02' THEN '提交' - WHEN '03' THEN '开始' + WHEN '03' THEN '维修开始' WHEN '04' THEN '委外维修' WHEN '05' THEN '委外验收' - WHEN '06' THEN '结束' - WHEN '07' THEN '确认' - WHEN '99' THEN '审核' + WHEN '06' THEN '维修结束' + WHEN '07' THEN '班组确认' + WHEN '99' THEN '审核完毕' END ) END @@ -368,6 +368,7 @@ st.is_delete = '0' AND (st.status <> '99') AND mst.source_bill_type = 'BXD' + AND st.is_passed = '1' UNION @@ -388,10 +389,10 @@ mst.invstatus WHEN '01' THEN '生成' WHEN '02' THEN '提交' - WHEN '03' THEN '开始' - WHEN '04' THEN '结束' - WHEN '05' THEN '确认' - WHEN '99' THEN '审核' + WHEN '03' THEN '保养开始' + WHEN '04' THEN '保养结束' + WHEN '05' THEN '班组确认' + WHEN '99' THEN '审核完毕' END ) AS invstatus, mst.real_start_date, diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/rest/DevicemaintenanceplanmstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/rest/DevicemaintenanceplanmstController.java index 3f392273..39e4fbb4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/rest/DevicemaintenanceplanmstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/rest/DevicemaintenanceplanmstController.java @@ -47,6 +47,13 @@ public class DevicemaintenanceplanmstController { return new ResponseEntity<>(devicemaintenanceplanmstService.queryDevice(whereJson, page), HttpStatus.OK); } + @GetMapping("/queryDevice2") + @Log("查询设备档案2") + @ApiOperation("查询设备档案2") + public ResponseEntity queryDevice2(@RequestParam Map whereJson, Pageable page) { + return new ResponseEntity<>(devicemaintenanceplanmstService.queryDevice2(whereJson, page), HttpStatus.OK); + } + @PostMapping @Log("新增设备保养计划维护") @ApiOperation("新增设备保养计划维护") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/DevicemaintenanceplanmstService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/DevicemaintenanceplanmstService.java index cfc05d35..dc4007c2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/DevicemaintenanceplanmstService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/DevicemaintenanceplanmstService.java @@ -82,6 +82,15 @@ public interface DevicemaintenanceplanmstService { */ Map queryDevice(Map whereJson, Pageable page); + /** + * 查询数据分页 + * + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map queryDevice2(Map whereJson, Pageable page); + /** * 获取明细 * diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java index 56ab2c23..3f3a386e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java @@ -45,6 +45,7 @@ import cn.hutool.core.util.ObjectUtil; @Slf4j public class DevicemaintenanceplanmstServiceImpl implements DevicemaintenanceplanmstService { private final ClassstandardService classstandardService; + private final DeptService deptService; @Override public Map queryAll(Map whereJson, Pageable page) { @@ -244,6 +245,38 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla return json; } + @Override + public Map queryDevice2(Map whereJson, Pageable page) { + DeptService deptService = SpringContextHolder.getBean(DeptService.class); + String device_code = MapUtil.getStr(whereJson, "device_code"); + // 查询设备档案 + HashMap map = new HashMap<>(); + map.put("flag", "4"); + if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%"+device_code+"%"); + + String dept_id = MapUtil.getStr(whereJson, "dept_id"); + if (!StrUtil.isEmpty(dept_id)) { + String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id)); + map.put("deptIds", deptIds); + } + + String use_id = MapUtil.getStr(whereJson, "use_id"); + if (!StrUtil.isEmpty(use_id)) { + String useIds = deptService.getChildIdStr(Long.parseLong(use_id)); + map.put("useIds", useIds); + } + + // 获取当前登陆用户 + Long currentUserId = SecurityUtils.getCurrentUserId(); + String dept_str = deptService.getChildIdStr(currentUserId); + if (ObjectUtil.isNotEmpty(dept_str)) { + map.put("dept_str",dept_str); + } + + JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCEPLAN001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "file.update_time DESC"); + return json; + } + @Override @Transactional(rollbackFor = Exception.class) public JSONArray getDtl(JSONObject whereJson) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql index ca49d411..209e97c5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql @@ -115,7 +115,7 @@ WHERE mst.is_delete = '0' AND file.is_delete = '0' - AND mst.invstatus in ('07','99') + AND mst.invstatus in ('05','99') OPTION 输入.device_code <> "" (file.device_code like 输入.device_code or diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN001.wql index ef414777..c4f5fdd5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN001.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN001.wql @@ -15,6 +15,7 @@ ################################################# 输入.flag TYPEAS s_string 输入.classIds TYPEAS f_string + 输入.dept_str TYPEAS f_string 输入.deptIds TYPEAS f_string 输入.useIds TYPEAS f_string 输入.device_code TYPEAS s_string @@ -154,5 +155,41 @@ ENDQUERY ENDIF + IF 输入.flag = "4" + PAGEQUERY + SELECT + file.*, + class.class_name, + work.workprocedure_name, + d1.name AS dept_name, + d2.name AS use_name + FROM + EM_BI_EquipmentFile file + LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id + LEFT JOIN pdm_bi_workprocedure work ON file.workprocedure_id = work.workprocedure_id + LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id + LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id + WHERE + file.is_delete = '0' + AND file.status not in (90,91) + AND d2.dept_id in 输入.dept_str + + OPTION 输入.device_code <> "" + (file.device_code like 输入.device_code or + file.device_name like 输入.device_code) + ENDOPTION + + OPTION 输入.deptIds <> "" + d1.dept_id in 输入.deptIds + ENDOPTION + + OPTION 输入.useIds <> "" + d2.dept_id in 输入.useIds + ENDOPTION + + ENDSELECT + ENDPAGEQUERY + ENDIF + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java index 764511ce..734aa104 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java @@ -212,9 +212,10 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { JSONArray rows = new JSONArray(); for (int i = 0; i < jsonArr.size(); i++) { JSONObject row = jsonArr.getJSONObject(i); + String material_code = row.getString("material_code"); JSONObject bom = WQLObject.getWQLObject("md_pd_productbom").query("material_id = '"+row.get("material_id")+"'").uniqueResult(0); if (ObjectUtil.isEmpty(bom)){ - throw new BadRequestException("未查询到该产品对应BOM信息"); + throw new BadRequestException("未查询到该产品 "+material_code+" 对应BOM信息"); } row.put("1",row.getString("planstart_date")); row.put("2",row.getString("old_mark")); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql index b7b9aeb0..85dfa6ee 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql @@ -1,10 +1,10 @@ [交易说明] 交易名： 压制性能分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： [数据库] --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 @@ -33,22 +33,22 @@ [临时表] --这边列出来的临时表就会在运行期动态创建 - + [临时变量] --所有中间过程变量均可在此处定义 - + [业务过程] ########################################## # 1、输入输出检查 # ########################################## - + ########################################## # 2、主过程前处理 # ########################################## - - + + ########################################## # 3、业务主过程 # ########################################## @@ -58,14 +58,14 @@ SELECT MAX( mb.material_code ) AS material_code, SUM( off.qty ) AS qty, - off.material_id, - off.pcsn, + MAX( off.material_id) AS material_id, + MAX( off.pcsn) AS pcsn, MAX( off.create_time ) AS create_time, MAX( off.create_name ) AS create_name, MAX( wo.planend_time ) AS planend_time, MAX( wo.realend_time ) AS realend_time, datediff (MAX( wo.planend_time ),MAX( wo.realend_time )) AS off_days, - ext.old_mark + MAX( ext.old_mark) AS old_mark FROM pdm_bi_procedureoffline off LEFT JOIN pdm_bi_workorder wo ON wo.workorder_id = off.workorder_id @@ -446,10 +446,12 @@ plan.product_num, ext.old_mark, plan.product_weight, - plan.material_id + plan.material_id, + materialbase.material_code FROM mps_bd_productdailyplan plan LEFT JOIN md_me_producmaterialext ext ON ext.material_id = plan.material_id + LEFT JOIN md_me_materialbase materialbase ON materialbase.material_id = plan.material_id WHERE 1=1 OPTION 输入.begin_time <> "" diff --git a/mes/qd/src/views/wms/basedata/em/deviceInfo/index.vue b/mes/qd/src/views/wms/basedata/em/deviceInfo/index.vue index 5e9614f7..293d5a6c 100644 --- a/mes/qd/src/views/wms/basedata/em/deviceInfo/index.vue +++ b/mes/qd/src/views/wms/basedata/em/deviceInfo/index.vue @@ -57,7 +57,18 @@ - + + + 打印 + + @@ -253,6 +264,7 @@ import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure' +import {getLodop} from "@/assets/js/lodop/LodopFuncs"; const defaultForm = { device_id: null, device_code: null, device_name: null, device_model: null, device_specification: null, device_attribute_scode: null, is_produceuse: null, manufacturer: null, remark: null, is_active: '1', extend_code: null, workprocedure_id: null, workprocedure_code: null, workprocedure_name: null, create_id: null, create_name: null, create_time: null, is_delete: null, devicebill_id: null, device_capacity_qty: null, honor_time: null } export default { @@ -356,6 +368,26 @@ export default { return item.name } } + }, + print() { + const _selectData = this.$refs.table.selection + if (!_selectData || _selectData.length < 1) { + this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO) + return + } + for (let i = 0; i < _selectData.length; i++) { + const code = _selectData[i].device_code + const LODOP = getLodop() + LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮 + // 打印纸张大小设置https://www.it610.com/article/2094844.html + LODOP.SET_PRINT_PAGESIZE(1, '50mm', '30mm', '') + // LODOP.ADD_PRINT_RECT('0mm', '0mm', '48mm', '28mm', 0, 1) + LODOP.ADD_PRINT_BARCODE('4.3mm', '8.2mm', '40mm', '20mm', '128Auto', code) + // LODOP.PREVIEW()// 预览 + LODOP.PRINT()// 打印 + this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.toQuery() + } } } } diff --git a/mes/qd/src/views/wms/basedata/em/devicebom/index.vue b/mes/qd/src/views/wms/basedata/em/devicebom/index.vue index c4119950..67109ca4 100644 --- a/mes/qd/src/views/wms/basedata/em/devicebom/index.vue +++ b/mes/qd/src/views/wms/basedata/em/devicebom/index.vue @@ -1,5 +1,5 @@ - - - + + - + - - - + + + - - + + - - - - - - + + + + + + @@ -201,6 +210,7 @@ import workorder from '@/api/wms/pdm/workorder' import crudseriesProcessRoute from '@/api/wms/pdm/seriesProcessRoute' import { download } from '@/api/data' import { downloadFile } from '@/utils' +import Date from '@/utils/datetime' export default { name: 'dailyplan', @@ -213,7 +223,7 @@ export default { url: 'api/dailyplan', idField: 'dailyplan_id', sort: '', - query: { device_id: '' }, + query: { nowstart_date: new Date(),device_id: '' }, crudMethod: { ...dailyplan }, optShow: { add: true, @@ -316,7 +326,7 @@ export default { return false } this.form.device_id = this.crud.query.device_id - this.$refs.child.getMsg(this.crud.query.device_id) + this.$refs.child.getMsg(this.crud.query.device_id, this.crud.query.nowstart_date, this.crud.query.checked) this.structshow = true }, downdtl() { diff --git a/mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue b/mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue index 9a9836f3..a0043441 100644 --- a/mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue +++ b/mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue @@ -90,11 +90,21 @@ - + - - - + + @@ -127,6 +137,7 @@ import DeviceDialog from '@/views/wms/pub/DeviceDialog' import MaterDialog from '@/views/wms/pub/MaterDialog' import workorder from '@/api/wms/pdm/workorder' import crudseriesProcessRoute from '@/api/wms/pdm/seriesProcessRoute' +import producetask from '@/api/wms/pdm/producetask' const defaultForm = { workorder_code: '', @@ -164,6 +175,7 @@ export default { materType: '05', XLList: [], Depts: [], + Devices: [], materShow: false, rules: { pcsn: [ @@ -204,6 +216,9 @@ export default { workorder.getDepts().then(res => { this.Depts = res }) + producetask.getDevices().then(res => { + this.Devices = res + }) }, methods: { close() { diff --git a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue index 6f818034..c6af1bca 100644 --- a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue @@ -235,23 +235,23 @@ /> - + - - - - + + + + - + - - + + diff --git a/mes/qd/src/views/wms/pf/initformula/index.vue b/mes/qd/src/views/wms/pf/initformula/index.vue index 04fa7544..be608741 100644 --- a/mes/qd/src/views/wms/pf/initformula/index.vue +++ b/mes/qd/src/views/wms/pf/initformula/index.vue @@ -139,24 +139,24 @@ :highlight-current-row="true" @selection-change="mySelectionChange" > - - + + - - + + - - - - - - - - + + + + + + + + diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairpa/ExecuteDialog.vue b/mes/qd/src/views/wms/sb/repair/devicerepairpa/ExecuteDialog.vue index 6eff7242..dabb318f 100644 --- a/mes/qd/src/views/wms/sb/repair/devicerepairpa/ExecuteDialog.vue +++ b/mes/qd/src/views/wms/sb/repair/devicerepairpa/ExecuteDialog.vue @@ -14,7 +14,7 @@ - 结束维修 + 保存并结束 保存 关闭 @@ -81,6 +81,38 @@ +
+ 结果录入 +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
项目明细
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue index bdaa0c87..ceb94389 100644 --- a/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue +++ b/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue @@ -89,6 +89,17 @@ > 开始维修 + + 委外维修 + @@ -370,6 +381,17 @@ export default { this.crud.notify('状态不正确', CRUD.NOTIFICATION_TYPE.INFO) } }, + outRepair() { + const _selectData = this.$refs.table.selection + const data = _selectData[0] + if (data.invstatus !== '03') { + return this.crud.notify('只能对开始状态的单据维修', CRUD.NOTIFICATION_TYPE.INFO) + } + crudDevicerepairmst.outRepair(data).then(res => { + this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.toQuery() + }) + }, mySelectionChange(rows) { this.buttonChange(rows) }, @@ -386,7 +408,7 @@ export default { if ('01,03,04,05,06,07,99'.includes(rows[i].invstatus)) { this.start_flag = true } - if ('01,02,06,07,99'.includes(rows[i].invstatus)) { + if ('01,02,04,05,06,07,99'.includes(rows[i].invstatus)) { this.execu_flag = true } if ('01,02,04,06,07,99'.includes(rows[i].invstatus)) { diff --git a/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue index 8d4e0f14..c4d908bf 100644 --- a/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue +++ b/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue @@ -78,7 +78,7 @@ - 委外维修 - + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取 消 + 确 定 + + + + + + + diff --git a/mes/qd/src/views/wms/sb/repair/devicevprs/index.vue b/mes/qd/src/views/wms/sb/repair/devicevprs/index.vue index 73a1dfe1..965566e5 100644 --- a/mes/qd/src/views/wms/sb/repair/devicevprs/index.vue +++ b/mes/qd/src/views/wms/sb/repair/devicevprs/index.vue @@ -96,19 +96,6 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -202,7 +205,7 @@ import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import crudMaterialbase from '@/api/wms/basedata/master/materialbase' import PicDialog from '@/views/wms/sb/repair/devicerepairrequest/PicDialog' -import DeviceDialog from '@/views/wms/sb/upkeep/devicemaintenanceplan/DeviceDialog' +import DeviceDialog from '@/views/wms/sb/repair/devicevprs/DeviceDialog' import FaultDialog from '@/views/wms/sb/repair/devicevprs/FaultDialog' import { getDepts } from '@/api/system/dept' @@ -309,13 +312,7 @@ export default { }) }, formaLevelName(row, cloum) { - if (row.fault_level === '01') { - return '一级' - } else if (row.fault_level === '02') { - return '二级' - } else if (row.fault_level === '03') { - return '三级' - } + return this.dict.label.EM_FAULT_LEVEL[row.fault_level] }, formatStatusName(row, cloum) { if (row.status === '01') { diff --git a/mes/qd/src/views/wms/sb/stat/devicefaultcae/index.vue b/mes/qd/src/views/wms/sb/stat/devicefaultcae/index.vue index 1adc7567..1f19f84a 100644 --- a/mes/qd/src/views/wms/sb/stat/devicefaultcae/index.vue +++ b/mes/qd/src/views/wms/sb/stat/devicefaultcae/index.vue @@ -69,11 +69,13 @@ + + diff --git a/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue b/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue index 3eac81e1..291ec39a 100644 --- a/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue +++ b/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue @@ -9,14 +9,14 @@ - - + + - - - + + + @@ -148,7 +148,7 @@ export default { } .t_btn2 >>> .el-table--enable-row-transition .el-table__body td, .el-table .cell { - padding: 0; + padding: 5px 0px; background-color: transparent; } diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue index 3b54d5f1..7e44c8c6 100644 --- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue @@ -111,6 +111,7 @@ +