diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java index 87a589cc..97f4c7bc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java @@ -103,6 +103,11 @@ public class ClassstandardServiceImpl implements ClassstandardService { if (classstandardDto != null && classstandardDto.getIs_delete().equals("0") && dto.getBase_data_type().equals(classstandardDto.getBase_data_type())) { throw new BadRequestException("存在相同的基础类别编号"); } + WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard"); + JSONObject old = wo.query("is_delete='0' and class_code='"+class_code+"'").uniqueResult(0); + if(old!=null){ + throw new BadRequestException("已存在相同编码！"); + } Long currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getNickName(); String now = DateUtil.now(); @@ -124,7 +129,7 @@ public class ClassstandardServiceImpl implements ClassstandardService { dto.setIs_modify("0"); } - WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard"); + JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.insert(json); @@ -147,7 +152,11 @@ public class ClassstandardServiceImpl implements ClassstandardService { if (classstandardDto != null && !dto.getClass_id().equals(classstandardDto.getClass_id()) && classstandardDto.getIs_delete().equals("0") && dto.getBase_data_type().equals(classstandardDto.getBase_data_type())) { throw new BadRequestException("存在相同的供应商编号"); } - + WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard"); + JSONObject old = wo.query("is_delete='0' and class_code='"+class_code+"' and class_id<>'"+dto.getClass_id()+"'").uniqueResult(0); + if(old!=null){ + throw new BadRequestException("已存在相同编码！"); + } Long oldPid = findById(dto.getClass_id() + "").getParent_class_id(); Long newPid = dto.getParent_class_id(); @@ -163,7 +172,6 @@ public class ClassstandardServiceImpl implements ClassstandardService { dto.setUpdate_optid(currentUserId); dto.setUpdate_optname(nickName); - WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.update(json); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEPOINT.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEPOINT.wql index a6009e24..7c79c5d9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEPOINT.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEPOINT.wql @@ -47,6 +47,8 @@ svp.storagevehiclepoint_id, svp.storagevehicle_id, svp.storagevehicle_code, + svp.update_optname AS update_optname2, + svp.update_time AS update_time2, svp.set_type, d.label AS set_type_name FROM diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/impl/ItempointServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/impl/ItempointServiceImpl.java index 21988e41..ac394d12 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/impl/ItempointServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/impl/ItempointServiceImpl.java @@ -44,7 +44,7 @@ public class ItempointServiceImpl implements ItempointService { map.put("flag", "1"); map.put("item_type", item_type); if (!ObjectUtil.isEmpty(item_code)) map.put("item_code", "%" + item_code + "%"); - JSONObject json = WQL.getWO("PA_BASE_ITEMPOINT001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "item.update_time desc"); + JSONObject json = WQL.getWO("PA_BASE_ITEMPOINT001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "item.item_code"); return json; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/impl/PerformancemstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/impl/PerformancemstServiceImpl.java index 1f9685f6..69c4c988 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/impl/PerformancemstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/impl/PerformancemstServiceImpl.java @@ -66,12 +66,12 @@ public class PerformancemstServiceImpl implements PerformancemstService { String assessor_id = (String) whereJson.get("assessor_id"); String assessor_date = (String) whereJson.get("assessor_date"); HashMap map = new HashMap<>(); - map.put("flag", "1"); + map.put("flag", "01"); if (ObjectUtil.isNotEmpty(assessor_id)) { map.put("assessor_id", "%" + assessor_id + "%"); } map.put("assessor_date", assessor_date); - JSONObject json = WQL.getWO("QL_TEST_PERFORMANCEMST01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.update_time desc"); + JSONObject json = WQL.getWO("QL_TEST_PERFORMANCEMST01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.status,mst.assessor_date desc,user.nick_name"); return json; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/wql/QL_TEST_PERFORMANCEMST01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/wql/QL_TEST_PERFORMANCEMST01.wql index 9eeac759..45025a4a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/wql/QL_TEST_PERFORMANCEMST01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/wql/QL_TEST_PERFORMANCEMST01.wql @@ -82,6 +82,44 @@ ENDPAGEQUERY ENDIF + IF 输入.flag = "01" + PAGEQUERY + SELECT + mst.performance_id, + mst.performance_code, + mst.assessor_id, + mst.assessor_date, + round(mst.total_score,2) AS total_score, + mst.status, + mst.remark, + mst.create_name, + mst.create_time, + mst.update_optname, + mst.update_time, + mst.confirm_optname, + mst.confirm_time, + mst.is_delete, + user.nick_name AS assessor_name + FROM + QL_TEST_PerformanceMst mst + LEFT JOIN sys_user user ON mst.assessor_id = user.user_id + WHERE + mst.is_delete = '0' + + OPTION 输入.assessor_id <> "" + user.nick_name like 输入.assessor_id + ENDOPTION + OPTION 输入.create_id <> "" + mst.assessor_id = 输入.create_id + ENDOPTION + OPTION 输入.assessor_date <> "" + mst.assessor_date = 输入.assessor_date + ENDOPTION + + ENDSELECT + ENDPAGEQUERY + ENDIF + IF 输入.flag = "2" QUERY SELECT diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKTASK01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKTASK01.wql index 629e3387..da0d3599 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKTASK01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKTASK01.wql @@ -83,7 +83,7 @@ WorkTask.workprocedure_id = 输入.workprocedure_id ENDOPTION OPTION 输入.device_code <> "" - device.device_code like 输入.device_code + (device.device_code like 输入.device_code or device.device_name like 输入.device_code) ENDOPTION OPTION 输入.status <> "" WorkTask.status = 输入.status diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java index 48b92e3f..2c84ef0e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java @@ -11,6 +11,7 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.google.common.collect.Maps; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.exception.BadRequestException; @@ -39,6 +40,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.*; +import java.util.stream.Collectors; /** * @author Lxy @@ -785,51 +787,88 @@ public class FlourworkServiceImpl implements FlourworkService { @Override public Map queryException(Map whereJson, Pageable page) { - String is_deal = MapUtil.getStr(whereJson, "is_deal"); - String is_all = MapUtil.getStr(whereJson, "is_all"); - String device_id = MapUtil.getStr(whereJson, "device_id"); + String is_query = MapUtil.getStr(whereJson, "is_query"); + JSONObject json = new JSONObject(); + if(ObjectUtil.isEmpty(is_query) || is_query.equals("0")){ + json.put("content",new JSONArray()); + json.put("total","0"); + }else{ + WQLObject md_me_materialbase = WQLObject.getWQLObject("md_me_materialbase"); + String is_deal = MapUtil.getStr(whereJson, "is_deal"); + String is_all = MapUtil.getStr(whereJson, "is_all"); + String device_id = MapUtil.getStr(whereJson, "device_id"); - HashMap map = new HashMap<>(); - map.put("flag", "5"); - map.put("device_id", device_id); - map.put("formula_code", MapUtil.getStr(whereJson, "formula_code")); - if (ObjectUtil.isEmpty(is_deal)) { - is_deal = "0"; - map.put("is_process", is_deal); + HashMap map = new HashMap<>(); + map.put("flag", "5"); + map.put("device_id", device_id); + map.put("formula_code", MapUtil.getStr(whereJson, "formula_code")); + if (ObjectUtil.isEmpty(is_deal)) { + is_deal = "0"; + map.put("is_process", is_deal); + } + if (ObjectUtil.isNotEmpty(is_deal)) map.put("is_process", is_deal); + + String num1 = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("SMALL_BALANCE1").getValue(); + String num2 = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("SMALL_BALANCE2").getValue(); + String num3 = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("SMALL_BALANCE3").getValue(); + + map.put("num1", num1); + map.put("num2", num2); + map.put("num3", num3); + map.put("is_all", is_all); + + json = WQL.getWO("QPDM_BI_FORMULA01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "a.formula_code,a.put_time DESC"); + + JSONArray array = json.getJSONArray("content"); + if (ObjectUtil.isNotEmpty(array)){ + JSONArray array2 = new JSONArray(); + for(int i=0;i< array.size();i++){ + JSONObject jo = array.getJSONObject(i); + String material_id = jo.getString("material_id"); + JSONObject mater1 = md_me_materialbase.query("material_id='"+material_id+"'").uniqueResult(0); + if(mater1!=null){ + jo.put("product_material_code",mater1.getString("material_code")); + } + String dtl_material_id = jo.getString("dtl_material_id"); + JSONObject mater2 = md_me_materialbase.query("material_id='"+dtl_material_id+"'").uniqueResult(0); + if(mater2!=null){ + jo.put("dtl_material_code",mater2.getString("material_code")); + jo.put("dtl_material_name",mater2.getString("material_name")); + } + array2.add(jo); + } + json.put("content",array2); + } } - if (ObjectUtil.isNotEmpty(is_deal)) map.put("is_process", is_deal); - - String num1 = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("SMALL_BALANCE1").getValue(); - String num2 = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("SMALL_BALANCE2").getValue(); - String num3 = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("SMALL_BALANCE3").getValue(); - - map.put("num1", num1); - map.put("num2", num2); - map.put("num3", num3); - map.put("is_all", is_all); - - JSONObject json = WQL.getWO("QPDM_BI_FORMULA01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "a.formula_code,a.put_time DESC"); return json; } @Override @Transactional(rollbackFor = Exception.class) public void exceptionSure(JSONObject whereJson) { - String formuladtljob_id = whereJson.getString("formuladtljob_id"); Long currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getNickName(); String now = DateUtil.now(); WQLObject dtlJobTab = WQLObject.getWQLObject("PDM_BI_FormulaDtlJob"); // 作业明细表 - JSONObject jsonDtlJob = dtlJobTab.query("formuladtljob_id = '" + formuladtljob_id + "'").uniqueResult(0); - if (!StrUtil.equals(jsonDtlJob.getString("is_process"), "0")) throw new BadRequestException("状态必须为未处理"); - jsonDtlJob.put("is_process", "1"); - jsonDtlJob.put("process_id", currentUserId); - jsonDtlJob.put("process_name", nickName); - jsonDtlJob.put("process_time", now); - jsonDtlJob.put("process_type", "0"); - dtlJobTab.update(jsonDtlJob); + + + JSONArray rows = whereJson.getJSONArray("rows"); + for(int i=0;i "" + SELECT + mst.storagevehicle_code, + mst.pcsn AS product_pcsn, + dtlJob.pcsn AS dtl_pcsn, + dtlJob.bucketunique, + dtlJob.storage_qty, + dtlJob.putconfirm_qty, + mst.material_id, + dtlJob.material_id AS dtl_material_id, + dtlJob.outconfirm_qty, + mst.workorder_id AS workordercard_id, + (dtlJob.putconfirm_qty - dtlJob.outconfirm_qty) AS bad_qty, + dtlJob.formula_code, + dtlJob.struct_code, + dtlJob.jobstoragevehicle_code, + dtlJob.put_name, + dtlJob.put_time, + dtlJob.is_process, + dtlJob.process_name, + dtlJob.process_time, + dtlJob.formuladtljob_id, + dtlJob.formuladtl_id, + dtlJob.formula_id, + task.device_id + FROM + PDM_BI_FormulaDtlJob dtlJob + INNER JOIN PDM_BI_Formula mst ON mst.formula_id = dtlJob.formula_id + INNER JOIN PDM_BI_WorkTask task ON task.workorder_id = mst.workorder_id + AND task.workprocedure_code = 'GX001' + WHERE + mst.is_delete = '0' + AND dtlJob.is_abnormal = '1' + OPTION 输入.device_id <> "" task.device_id = 输入.device_id ENDOPTION - OPTION 输入.is_process <> "" dtlJob.is_process = 输入.is_process ENDOPTION - OPTION 输入.formula_code <> "" mst.formula_code = 输入.formula_code ENDOPTION ) a - where - 1=1 - OPTION 输入.is_all <> "1" - (a.device_code = 'PFW001' AND a.bad_qty > 输入.num1) - OR - (a.device_code = 'PFW002' AND a.bad_qty > 输入.num2) - OR - (a.device_code = 'PFW003' AND a.bad_qty > 输入.num3) + where 1=1 + OPTION 输入.is_all <> "1" + (( a.device_id = '1510803277447565312' AND a.bad_qty > 输入.num1) + OR + ( a.device_id = '1510803382053507072' AND a.bad_qty > 输入.num2) + OR + ( a.device_id = '1510803479571075072' AND a.bad_qty > 输入.num3)) ENDOPTION - - - ENDSELECT ENDPAGEQUERY ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/rest/SparePartOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/rest/SparePartOutController.java index e131a7ca..4bea1254 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/rest/SparePartOutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/rest/SparePartOutController.java @@ -85,12 +85,12 @@ public class SparePartOutController { return new ResponseEntity<>(sparePartOutService.getStructIvt(whereJson), HttpStatus.OK); } - @PostMapping("/getIvt") + @GetMapping("/getIvt") @Log("查询备件库存") @ApiOperation("查询备件库存") //@PreAuthorize("@el.check('materialtype:list')") - public ResponseEntity getIvt(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(sparePartOutService.getIvt(whereJson), HttpStatus.OK); + public ResponseEntity getIvt(@RequestParam Map whereJson, Pageable page) { + return new ResponseEntity<>(sparePartOutService.getIvt(whereJson,page), HttpStatus.OK); } @PostMapping("/insertDis") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/SparePartOutService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/SparePartOutService.java index f0107463..37e1e710 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/SparePartOutService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/SparePartOutService.java @@ -37,7 +37,7 @@ public interface SparePartOutService { JSONArray getStructIvt(JSONObject whereJson); - JSONArray getIvt(JSONObject whereJson); + Map getIvt(Map whereJson, Pageable page); void divStruct(JSONObject whereJson); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/impl/SparePartOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/impl/SparePartOutServiceImpl.java index a3b410f8..00ad89e6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/impl/SparePartOutServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/impl/SparePartOutServiceImpl.java @@ -199,14 +199,14 @@ public class SparePartOutServiceImpl implements SparePartOutService { } @Override - public JSONArray getIvt(JSONObject whereJson) { - String search = whereJson.getString("search"); + public Map getIvt(Map whereJson, Pageable page) { + String search = (String) whereJson.get("search"); HashMap map = new HashMap<>(); map.put("flag", "11"); if (StrUtil.isNotEmpty(search)) { map.put("search", search); } - JSONArray dtl_rows = WQL.getWO("QEM_BI_SPAREPARTOUT").addParamMap(map).process().getResultJSONArray(0); + JSONObject dtl_rows = WQL.getWO("QEM_BI_SPAREPARTOUT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "material_code"); return dtl_rows; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPART.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPART.wql index 6b44a981..e09d734c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPART.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPART.wql @@ -71,7 +71,7 @@ (case when dtl.source_bill_type = 'PO' then '备件采购入库' else '' end ) AS source_type_name FROM em_bi_iostorinv ios - LEFT JOIN em_bi_iostorinvdtl dtl ON dtl.iostorinv_id = ios.iostorinv_id + LEFT JOIN em_bi_iostorinvdtl dtl ON dtl.iostorinv_id = ios.iostorinv_id and dtl.seq_no='1' WHERE ios.buss_type = 输入.buss_type AND diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPARTOUT.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPARTOUT.wql index b627c2e6..06e30b4c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPARTOUT.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPARTOUT.wql @@ -434,7 +434,7 @@ ENDIF IF 输入.flag = "11" - QUERY + PAGEQUERY SELECT mb.material_code, mb.material_name, @@ -484,7 +484,7 @@ ) ENDOPTION ENDSELECT - ENDQUERY + ENDPAGEQUERY ENDIF IF 输入.flag = "12" diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicefaultcaeServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicefaultcaeServiceImpl.java index 2863c7e3..f589a0cc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicefaultcaeServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicefaultcaeServiceImpl.java @@ -74,9 +74,8 @@ public class DevicefaultcaeServiceImpl implements DevicefaultcaeService { map.put("classIds", classIds); } - JSONObject json = WQL.getWO("EM_DEVICEFAULTCAE01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "re.devicerecord_id DESC"); -/* // 处理平均故障间隔时间 && 平均故障修复时间 - WQLObject tab = WQLObject.getWQLObject("EM_BI_DeviceRepairRequest");*/ + JSONObject json = WQL.getWO("EM_DEVICEFAULTCAE01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "dept.name,file.device_code"); +/* // 处理平均故障间隔时间 && 平均故障修复时间*/ JSONArray content = json.getJSONArray("content"); for (int i = 0; i < content.size(); i++) { JSONObject jsonObject = content.getJSONObject(i); @@ -111,39 +110,6 @@ public class DevicefaultcaeServiceImpl implements DevicefaultcaeService { jsonObject.put("avgRep_time","0"); } } - /*JSONArray arr = tab.query("devicerecord_id = '" + devicerecord_id + "' and is_delete = '0'").getResultJSONArray(0); - // 计算平均故障修复时间 - String nunm = jsonObject.getString("nunm"); - String create_time_all = "0"; - String finish_time_all = "0"; - for (int j = 0; j < arr.size(); j++) { - JSONObject jsonObject1 = arr.getJSONObject(j); - // 去掉时间中的特殊字符 - String create_time = jsonObject1.getString("create_time").substring(0,10).replaceAll("[[\\s-:punct:]]",""); - String finish_time = "0"; - if (ObjectUtil.isNotEmpty(jsonObject1.getString("finish_time"))) { - finish_time = jsonObject1.getString("finish_time").substring(0,10).replaceAll("[[\\s-:punct:]]",""); - } - // 相加 - create_time_all = String.valueOf(NumberUtil.add(create_time_all,create_time)); - finish_time_all = String.valueOf(NumberUtil.add(finish_time_all,finish_time)); - } - BigDecimal mul = NumberUtil.mul(NumberUtil.sub(finish_time_all, create_time_all), 24); - BigDecimal div = NumberUtil.div(mul.toString(), nunm); - - if (div.intValue() < 0) { - jsonObject.put("avgRep_time","0"); - } else { - jsonObject.put("avgRep_time",String.valueOf(div)); - } - - // 计算平均故障间隔时间 - String re_end_time = end_time.substring(0, 10).replaceAll("[[\\s-:punct:]]", ""); - String re_begin_time = begin_time.substring(0, 10).replaceAll("[[\\s-:punct:]]", ""); - - BigDecimal add = NumberUtil.add(NumberUtil.sub(re_end_time, re_begin_time).toString(), "1"); - BigDecimal avgVal_time = NumberUtil.div(NumberUtil.mul(add, 24).toString(), nunm); - jsonObject.put("avgVal_time",avgVal_time.toString());*/ } json.put("content",content); return json; 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 1543c479..216ca0b9 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 @@ -90,9 +90,6 @@ OPTION 输入.end_time <> "" re.fault_time <= 输入.end_time ENDOPTION - - group by re.devicerecord_id - ENDSELECT ENDPAGEQUERY ENDIF @@ -174,4 +171,4 @@ ENDSELECT ENDQUERY - ENDIF \ No newline at end of file + ENDIF diff --git a/mes/qd/src/views/wms/basedata/master/class/index.vue b/mes/qd/src/views/wms/basedata/master/class/index.vue index eedf8fcd..9162ad3d 100644 --- a/mes/qd/src/views/wms/basedata/master/class/index.vue +++ b/mes/qd/src/views/wms/basedata/master/class/index.vue @@ -65,7 +65,7 @@ - + 是 否 @@ -187,6 +187,7 @@ export default { data() { return { classes: [], + base_data_type: null, permission: {}, rules: { class_id: [ @@ -290,6 +291,18 @@ export default { this.classes = date }) }, + mychange(val) { + if (val === '0' && this.form.base_data_type != null) { + crudClassstandard.getClass({ base_data_type: this.form.base_data_type }).then(res => { + this.classes = res.content.map(function(obj) { + if (obj.hasChildren) { + obj.children = null + } + return obj + }) + }) + } + }, getClass() { crudClassstandard.getClass({ enabled: true }).then(res => { this.classes = res.content.map(function(obj) { diff --git a/mes/qd/src/views/wms/basedata/master/storageVehiclePoint/index.vue b/mes/qd/src/views/wms/basedata/master/storageVehiclePoint/index.vue index 2a5d8e27..f1e0a527 100644 --- a/mes/qd/src/views/wms/basedata/master/storageVehiclePoint/index.vue +++ b/mes/qd/src/views/wms/basedata/master/storageVehiclePoint/index.vue @@ -58,7 +58,7 @@ - + @@ -74,16 +74,8 @@ - - - + + @@ -114,7 +106,7 @@ const defaultForm = { } export default { name: 'Storagevehiclepoint', - components: { pagination, crudOperation, rrOperation, udOperation }, + components: { pagination, crudOperation, rrOperation }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ @@ -147,6 +139,7 @@ export default { data() { return { storageVehicleTypeList: [], + checkrows: [], permission: { }} }, @@ -156,16 +149,17 @@ export default { }) }, methods: { - // 钩子：在获取表格数据之前执行，false 则代表不获取数据 - [CRUD.HOOK.beforeRefresh]() { - return true - }, hand(value) { this.crud.toQuery() }, save() { + this.checkrows = this.$refs.table.selection + if (this.checkrows.length === 0) { + this.crud.notify('请勾选需要操作的记录！') + return false + } const data = { - 'data': this.$refs.table.data + 'data': this.checkrows } crudStoragevehiclepoint.save(data).then(res => { this.crud.toQuery() diff --git a/mes/qd/src/views/wms/pa/workloadstat/index.vue b/mes/qd/src/views/wms/pa/workloadstat/index.vue index 5909acbd..d32979ab 100644 --- a/mes/qd/src/views/wms/pa/workloadstat/index.vue +++ b/mes/qd/src/views/wms/pa/workloadstat/index.vue @@ -22,18 +22,6 @@ @change="crud.toQuery" /> - - - - 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 d11149ca..dee03250 100644 --- a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue @@ -253,7 +253,7 @@ {{ scope.row.workorder_code }} - + diff --git a/mes/qd/src/views/wms/pdm/produce/worktask/index.vue b/mes/qd/src/views/wms/pdm/produce/worktask/index.vue index 94b30d26..fae74d3f 100644 --- a/mes/qd/src/views/wms/pdm/produce/worktask/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/worktask/index.vue @@ -81,12 +81,12 @@ /> - + diff --git a/mes/qd/src/views/wms/pf/flourwork/ExceptionDialog.vue b/mes/qd/src/views/wms/pf/flourwork/ExceptionDialog.vue index 28366bb4..5f7c80ec 100644 --- a/mes/qd/src/views/wms/pf/flourwork/ExceptionDialog.vue +++ b/mes/qd/src/views/wms/pf/flourwork/ExceptionDialog.vue @@ -67,7 +67,7 @@ - + @@ -94,28 +94,29 @@ style="width: 100%;" @selection-change="crud.selectionChangeHandler" > - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -132,23 +133,22 @@ import CRUD, { presenter, header, crud } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' -import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' -import crudOrderproc from '@/api/wms/pcs/orderproc' import crudFlourwork from '@/api/wms/pf/flourwork' import { download } from '@/api/data' import { downloadFile } from '@/utils' export default { name: 'ExceptionDialog', - components: { rrOperation, crudOperation, udOperation, pagination, crudOrderproc }, + components: { rrOperation, crudOperation, pagination }, mixins: [presenter(), header()], cruds() { return CRUD({ url: 'api/flourwork/queryException', - idField: 'formula_id', - sort: 'formula_id,desc', + idField: 'formuladtljob_id', + sort: '', crudMethod: { ... crudFlourwork }, + query: { is_deal: '0', is_all: '0', is_query: '0' }, optShow: { add: false, edit: false, @@ -195,29 +195,40 @@ export default { .catch(_ => { }) }, - // 钩子：在获取表格数据之前执行，false 则代表不获取数据 - [CRUD.HOOK.beforeRefresh]() { - return true - }, close() { + this.crud.resetQuery(false) this.$emit('update:dialogShow', false) }, open() { + this.crud.query.is_query = '1' this.crud.toQuery() }, hand(value) { this.crud.toQuery() }, + deviceListFormat(row) { + for (const item of this.deviceList) { + if (item.code === row.device_id) { + return item.name + } + } + }, formatQtyName(row, cloum) { return 'Kg' }, + formatQtyName2(row, cloum) { + if (row.is_process === '1') { + return '是' + } else { + return '否' + } + }, sure() { const _selectData = this.$refs.table.selection - if (!_selectData || _selectData.length !== 1) { - return this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO) + if (!_selectData || _selectData.length === 0) { + return this.crud.notify('请选择需要操作的记录', CRUD.NOTIFICATION_TYPE.INFO) } - const data = _selectData[0] - crudFlourwork.exceptionSure(data).then(res => { + crudFlourwork.exceptionSure({ 'rows': _selectData }).then(res => { this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery() }) diff --git a/mes/qd/src/views/wms/pf/flourwork/index.vue b/mes/qd/src/views/wms/pf/flourwork/index.vue index e374fa4a..7a709de3 100644 --- a/mes/qd/src/views/wms/pf/flourwork/index.vue +++ b/mes/qd/src/views/wms/pf/flourwork/index.vue @@ -59,22 +59,7 @@ - - diff --git a/mes/qd/src/views/wms/pf/formula/index.vue b/mes/qd/src/views/wms/pf/formula/index.vue index 9250f55e..3c33865a 100644 --- a/mes/qd/src/views/wms/pf/formula/index.vue +++ b/mes/qd/src/views/wms/pf/formula/index.vue @@ -37,7 +37,8 @@ start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" - @change="crud.toQuery" + @input="onInput()" + @change="mytoQuery" /> @@ -130,16 +131,6 @@ > 配粉补料 - - +