diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/MonitorController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/MonitorController.java index f5536f76..5e56748a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/MonitorController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/MonitorController.java @@ -18,6 +18,7 @@ package org.nl.modules.system.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.nl.annotation.rest.AnonymousGetMapping; import org.nl.modules.system.service.MonitorService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -36,7 +37,7 @@ public class MonitorController { private final MonitorService serverService; - @GetMapping + @AnonymousGetMapping @ApiOperation("查询服务监控") @PreAuthorize("@el.check('monitor:list')") public ResponseEntity query(){ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java index dde09097..e7dcaa73 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java @@ -347,7 +347,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService { } JSONObject jo_now = WQL.getWO("QPADST_IN_SERVICE").addParam("flag", "11").addParam("storagevehicle_code", storagevehicle_code).process().uniqueResult(0); if(jo_now!=null){ - throw new PdaRequestException("该载具"+storagevehicle_code+"已存在未完成的入库单！"); + throw new PdaRequestException("该载具"+storagevehicle_code+"已存在未完成的出入库单！"); } JSONObject mst_jo = new JSONObject(); String bill_code = CodeUtil.getNewCode("IO_CODE"); @@ -699,8 +699,8 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService { } if (StrUtil.isNotEmpty(bill_code)){ map.put("bill_code","%"+bill_code+"%"); - } - JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(ctx, "mst.input_time desc,material_code desc"); + }//flag 8 clsss_ids -> ('1503644362150645760') + JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(ctx, "receive_date desc,material_code desc"); JSONObject returnjo = new JSONObject(); returnjo.put("code", "1"); returnjo.put("desc", "查询成功！"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/em.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/em.xls index aff4466a..0025e235 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/em.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/em.xls differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/constant/MaterOptTypeEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/constant/MaterOptTypeEnum.java index 58b3d448..6c70bbe3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/constant/MaterOptTypeEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/constant/MaterOptTypeEnum.java @@ -34,7 +34,8 @@ public enum MaterOptTypeEnum { SBGZ(23, "24", "设备故障", "('1541964046385942528')", ""), TJJ_AND_OTHER(24, "25", "添加剂和其他有色金属粉", "('1503644361697660928','1503644362838511616')", ""), BJID(25, "26", "备品备件", "1503644361789935616", ""), - THW_AND_GF_AND_TJJ(26, "27", "碳化钨、钴粉、添加剂", "('1503644361664106496','1503644362192588800','1503644361697660928')", ""); + THW_AND_GF_AND_TJJ(26, "27", "碳化钨、钴粉、添加剂", "('1503644361664106496','1503644362192588800','1503644361697660928')", ""), + BCP_AND_YL_AND_FL(27, "28", "半成品、原辅料、合金制品", "('1503644359155912704','1503644353019645952','1503644353116114944','1503644349995552768')", ""); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java index d541af53..e2e9fe0f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.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; @@ -32,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @author zhouz @@ -50,14 +52,20 @@ public class MaterialParametersServiceImpl implements MaterialParametersService public Map queryAll(Map whereJson, Pageable page) { HashMap map = new HashMap<>(); String material_code = (String) whereJson.get("material_code"); + String material_type_id = (String) whereJson.get("material_type_id"); + String class_idStr = (String) whereJson.get("class_idStr"); map.put("flag", "1"); if (!StrUtil.isEmpty(material_code)) { //处理转义字符 - if (material_code.contains("\\")) material_code = material_code.replace("\\", "\\\\\\"); - map.put("material_code", material_code); + if (material_code.contains("\\")) { + material_code = material_code.replace("\\", "\\\\\\"); + } + map.put("material_code", "%"+material_code + "%"); + map.put("search", "%"+material_code + "%"); + } + if("null".equals(class_idStr) || StrUtil.isEmpty(class_idStr)){ + class_idStr = MaterOptTypeEnum.BCP_AND_YFL.getClass_idStr(); } - String material_type_id = (String) whereJson.get("material_type_id"); - String class_idStr = (String) whereJson.get("class_idStr"); //处理物料当前节点的所有子节点 if (!StrUtil.isEmpty(material_type_id)) { map.put("material_type_id", material_type_id); @@ -67,12 +75,22 @@ public class MaterialParametersServiceImpl implements MaterialParametersService String classIds = classstandardService.getAllChildIdStr(class_idStr); map.put("classIds", classIds); } - String class_code = (String) whereJson.get("class_code"); - if (!StrUtil.isEmpty(class_code)) { - map.put("class_code", class_code + "%"); + map.put("idssql", "1=1"); + map.put("flag", "2"); + JSONObject allmaterialIds = WQL.getWO("QMD_ME_MATERIAL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "material_id"); + JSONArray array = allmaterialIds.getJSONArray("content"); + String allmaterialId = " "; + if (ObjectUtil.isNotEmpty(array)){ + allmaterialId = "(\""+array.stream().map(o -> ((JSONObject) o).getString("material_id")).collect(Collectors.joining("\",\""))+"\")"; } - JSONObject json = WQL.getWO("QMT_MATERIALPARAMETERS_001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "material_id"); - return json; + Map query = Maps.newHashMap(); + query.put("flag", "11"); + query.put("materialIds", allmaterialId); + if (ObjectUtil.isNotEmpty(array)){ + JSONArray currentArray = WQL.getWO("QMT_MATERIALPARAMETERS_001").addParamMap(query).process().getResultJSONArray(0); + allmaterialIds.put("content",currentArray); + } + return allmaterialIds; } @Override diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java index 31007a07..8257bf54 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java @@ -100,7 +100,7 @@ public class MaterialbaseServiceImpl implements MaterialbaseService { map.put("idssql", "1=1"); } map.put("flag", "2"); - JSONObject allmaterialIds = WQL.getWO("QMD_ME_MATERIAL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "material_id"); + JSONObject allmaterialIds = WQL.getWO("QMD_ME_MATERIAL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mb.material_code"); JSONArray array = allmaterialIds.getJSONArray("content"); String allmaterialId = " "; if (ObjectUtil.isNotEmpty(array)){ @@ -109,8 +109,10 @@ public class MaterialbaseServiceImpl implements MaterialbaseService { Map query = Maps.newHashMap(); query.put("flag", "3"); query.put("materialIds", allmaterialId); - JSONArray currentArray = WQL.getWO("QMD_ME_MATERIAL").addParamMap(query).process().getResultJSONArray(0); - allmaterialIds.put("content",currentArray); + if (ObjectUtil.isNotEmpty(array)){ + JSONArray currentArray = WQL.getWO("QMD_ME_MATERIAL").addParamMap(query).process().getResultJSONArray(0); + allmaterialIds.put("content",currentArray); + } return allmaterialIds; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java index 237fbec4..7aa79f3f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java @@ -94,6 +94,7 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService String now = DateUtil.now(); String storagevehicle_type = (String) map.get("storagevehicle_type"); + String is_used = (String) map.get("is_used"); String code = ""; switch (storagevehicle_type) { case "10": @@ -128,6 +129,7 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService dto.setUpdate_optname(nickName); dto.setUpdate_time(now); dto.setCreate_time(now); + dto.setIs_used(is_used); dto.setStoragevehicle_type((String) map.get("storagevehicle_type")); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.insert(json); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql index 89639863..cfbc228e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql @@ -116,7 +116,7 @@ ENDIF IF 输入.flag = "3" - PAGEQUERY + QUERY SELECT mb.material_id, mb.material_code, @@ -146,8 +146,9 @@ OPTION 输入.materialIds <> "" mb.material_id in 输入.materialIds ENDOPTION + order by mb.material_code ENDSELECT - ENDPAGEQUERY + ENDQUERY ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql index e084baea..b7fa58cb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql @@ -19,6 +19,7 @@ 输入.material_type_id TYPEAS s_string 输入.class_code TYPEAS s_string 输入.classIds TYPEAS f_string + 输入.materialIds TYPEAS f_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -111,6 +112,67 @@ ENDPAGEQUERY ENDIF + IF 输入.flag = "11" + QUERY + SELECT + m.material_id, + m.material_code, + m.material_name, + m.base_unit_id, + m.material_type_id, + s.is_need_plan, + s.standard_weight AS stock_standard_weight, + s.is_report AS stock_is_report, + s.wc_seqno, + s.report_seqno, + s.is_pure, + s.is_need_move AS stock_is_need_move, + p.old_mark, + p.standard_mark, + p.product_mode, + p.is_auto_open, + p.waste_limit_down, + p.waste_limit_up, + p.report_time, + p.is_report AS produc_is_report, + p.is_again_put, + p.standard_weight AS produc_standard_weight, + p.product_series, + p.c_balance, + p.ball_speed, + p.weight_lost_up, + p.weight_lost_down, + p.product_ball_time, + p.standard_weight_pft, + p.is_need_move AS product_is_need_move, + p.net_rate, + p.technology_code, + p.ball_rate, + p.liquid_rate, + m.is_used, + m.update_optname, + m.update_time, + m.material_height_type, + b.class_name, + b.class_code, + u.unit_name, + work.value AS qm_time + FROM + md_me_materialbase m + LEFT JOIN md_me_stockmaterialext s ON m.material_id = s.material_id + LEFT JOIN md_me_producmaterialext p ON m.material_id = p.material_id + LEFT JOIN md_pb_classstandard b ON m.material_type_id = b.class_id + LEFT JOIN md_pb_measureunit u ON u.measure_unit_id = m.base_unit_id + LEFT JOIN PDM_BI_WorkProcedureParaProduct work ON work.material_id = m.material_id AND para_code = 'QM008' + WHERE + m.is_delete = '0' + OPTION 输入.materialIds <> "" + m.material_id in 输入.materialIds + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + IF 输入.flag = "3" PAGEQUERY SELECT @@ -209,3 +271,4 @@ ENDSELECT ENDPAGEQUERY ENDIF + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/lk/service/impl/LibraryqueryServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/lk/service/impl/LibraryqueryServiceImpl.java index 646d1108..c963c207 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/lk/service/impl/LibraryqueryServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/lk/service/impl/LibraryqueryServiceImpl.java @@ -50,7 +50,7 @@ public class LibraryqueryServiceImpl implements LibraryqueryService { map.put("status", MapUtil.getStr(whereJson,"status")); map.put("available", MapUtil.getStr(whereJson,"available")); - JSONObject json = WQL.getWO("QLK01").setDbname("dataSource2").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "inputtime DESC"); + JSONObject json = WQL.getWO("QLK01").setDbname("dataSource2").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "material_code,pcsn"); return json; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/FactoryCalendarServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/FactoryCalendarServiceImpl.java index 66aace4a..bbae0d18 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/FactoryCalendarServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/FactoryCalendarServiceImpl.java @@ -48,7 +48,7 @@ public class FactoryCalendarServiceImpl implements FactoryCalendarService { map.put("search", "%" + search + "%"); } - JSONObject json = WQL.getWO("QPDM_FACTORYCALENDAR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc"); + JSONObject json = WQL.getWO("QPDM_FACTORYCALENDAR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "factorycalendar_code"); return json; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java index 0b0d4884..29d5afc1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java @@ -288,6 +288,20 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService { dto.setUpdate_time(DateUtil.now()); dto.setRemark(remark); if(StrUtil.isNotEmpty(device_code) && !"null".equals(device_code)){ + + JSONObject jsonMater2 = MD_ME_ProducMaterialExt.query("material_id = '" + jsonMater.getString("material_id") + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonMater2)) { + throw new BadRequestException("此【" + material_code + "】物料未配置成品物料扩展信息"); + } + String product_series = jsonMater2.getString("product_series"); + if(StrUtil.isNotEmpty(product_series)){ + JSONObject device = WQL.getWO("QPDM_PRODUCTPLANPROC").addParam("flag", "33").addParam("product_series", product_series).addParam("device_code", device_code).process().uniqueResult(0); + if(device==null){ + throw new BadRequestException("此【" + material_code + "】物料系列排产设备不包含"+device_code); + } + }else{ + throw new BadRequestException("此【" + material_code + "】物料未配置产品系列属性"); + } JSONObject device = em_bi_deviceinfo.query("is_delete='0' and is_active='1' and device_code='"+device_code+"'").uniqueResult(0); if(device!=null){ dto.setDevice_id(device.getLong("device_id")); @@ -303,6 +317,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService { if(device!=null){ dto.setDevice_id(device.getLong("id")); } + }else{ + throw new BadRequestException("此【" + material_code + "】物料未配置产品系列属性"); } } dto.setTask_code(CodeUtil.getNewCode("PCS_TASK_CODE")); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql index c3308ac0..ed90efa6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql @@ -94,7 +94,7 @@ OPTION 输入.device_id <> "" pp.device_id = 输入.device_id ENDOPTION - order by pp.planstart_date,pp.plan_code + order by pp.planend_date,materialbase.material_code ENDSELECT ENDQUERY ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql index 2786304c..1c60dabf 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql @@ -17,6 +17,7 @@ 输入.product_type_name TYPEAS s_string 输入.plan_month TYPEAS s_string 输入.material_code TYPEAS s_string + 输入.device_code TYPEAS s_string 输入.task_code TYPEAS s_string 输入.is_proc TYPEAS s_string 输入.plan_org_code TYPEAS s_string @@ -172,6 +173,9 @@ OPTION 输入.product_series <> "" WorkDevice.product_series_id = 输入.product_series ENDOPTION + OPTION 输入.device_code <> "" + deviceinfo.device_code = 输入.device_code + ENDOPTION order by deviceinfo.device_code asc ENDSELECT ENDQUERY diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java index ddb7212e..4c54e6e6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java @@ -79,7 +79,7 @@ public class InspectionsheetmstServiceImpl implements InspectionsheetmstService } map.put("inspection_type", MapUtil.getStr(whereJson, "inspection_type")); map.put("bill_status", MapUtil.getStr(whereJson, "bill_status")); - JSONObject json = WQL.getWO("QL_TEST_INSPECTIONSHEET001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.update_time desc"); + JSONObject json = WQL.getWO("QL_TEST_INSPECTIONSHEET001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mater.material_code,mater.material_name"); return json; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java index 450ab81a..7f36db1e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java @@ -663,7 +663,7 @@ public class PhysicalMstServiceImpl implements PhysicalMstService { jsonPhyMst.put("sysdeptid", deptId); jsonPhyMst.put("result", ""); jsonPhyMst.put("grade", ""); - jsonPhyMst.put("is_effective", "0"); + jsonPhyMst.put("is_effective", "1"); phyMstTab.insert(jsonPhyMst); // 新增新的理化单明细表 for (int i = 0; i < oldPhydtlArr.size(); i++) { @@ -673,7 +673,10 @@ public class PhysicalMstServiceImpl implements PhysicalMstService { phyDtlTab.insert(oldPhydtl); } // 将老的理化单主表设置为 无效，将新的质检单设置为有效 - this.setValid(jsonPhyMst); + HashMap map = new HashMap(); + map.put("is_effective", "0"); + phyMstTab.update(map,"material_id='" + material_id + "' and pcsn = '" + pcsn + "' and inspection_id <> '" + jsonPhyMst.getString("inspection_id") + "'"); + // 更新一级质检单明细表 JSONObject sheetdtl = sheetDtlTab.query("material_id = '" + jsonPhyMst.getString("material_id") + "' and pcsn = '" + jsonPhyMst.getString("pcsn") + "'").uniqueResult(0); sheetdtl.put("bill_status", "30"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql index e00438c5..5c2b27df 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql @@ -119,3 +119,22 @@ ENDSELECT ENDQUERY ENDIF + + IF 输入.flag = "5" + QUERY + SELECT + ITEM_ID AS ext_id, + sum(QTY_ZT) AS notqty + FROM + PURCHASE_CONTRACT_VIEW + where + STATUSFLAG = '3' + AND DEL_FLAG = '0' + OPTION 输入.ext_id <> "" + ITEM_ID in 输入.ext_id + ENDOPTION + GROUP BY ITEM_ID + ENDSELECT + ENDQUERY + ENDIF + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/rest/DeviceBigScreenController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/rest/DeviceBigScreenController.java index fe3ac655..293f00d8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/rest/DeviceBigScreenController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/rest/DeviceBigScreenController.java @@ -1,5 +1,6 @@ package org.nl.wms.sb.bigscreen.rest; +import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -9,6 +10,7 @@ import org.nl.wms.sb.bigscreen.service.DeviceBigScreenService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -76,4 +78,12 @@ public class DeviceBigScreenController { public ResponseEntity getTodayTask(){ return new ResponseEntity<>(deviceBigScreenService.getTodayTask(),HttpStatus.OK); } + + @PostMapping("/updateWarnTime") + @Log("当日任务列表") + @ApiOperation("当日任务列表") + public ResponseEntity getTodayTask(@RequestBody JSONObject json){ + JSONObject jsonObject = deviceBigScreenService.updateWarnTime(json); + return new ResponseEntity<>(jsonObject,HttpStatus.OK); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/DeviceBigScreenService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/DeviceBigScreenService.java index dd68213c..6d9352c9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/DeviceBigScreenService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/DeviceBigScreenService.java @@ -51,4 +51,9 @@ public interface DeviceBigScreenService { * @return JSONObject */ JSONObject getTodayTask(); + + /** + * 更新播报时间 + */ + JSONObject updateWarnTime(JSONObject json); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java index ace0b1b6..c753caa1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java @@ -16,6 +16,7 @@ import org.springframework.stereotype.Service; import java.util.Date; import java.util.HashMap; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor @@ -530,17 +531,69 @@ public class DeviceBigScreenServiceImpl implements DeviceBigScreenService { public JSONObject getTodayTask() { JSONObject resultJson = new JSONObject(); JSONObject resultData = new JSONObject(); - + WQLObject EM_BI_DeviceRepairRequest = WQLObject.getWQLObject("EM_BI_DeviceRepairRequest"); HashMap map = new HashMap<>(); map.put("flag", "4"); JSONArray resultJSONArray = WQL.getWO("TASK_AUTOWEBSOCKETTSK").addParamMap(map).process().getResultJSONArray(0); - resultData.put("device_group_arr", resultJSONArray); + JSONArray ja = new JSONArray(); + for(int i=0;i= min_10){ + jo.put("needCast","1"); + } + } + } + } + } + ja.add(jo); + } + + resultData.put("device_group_arr", ja); resultJson.put("srb", resultData); resultJson.put("code", "1"); resultJson.put("desc", "查询成功"); return resultJson; } + + @Override + public JSONObject updateWarnTime(JSONObject json) { + JSONObject result = new JSONObject(); + if (ObjectUtil.isNotEmpty(json)){ + try { + JSONArray ids = json.getJSONArray("ids"); + String requestId = ids.stream().map(o -> (String) o).collect(Collectors.joining("','")); + JSONObject param = new JSONObject(); + param.put("WARN_TIME", DateUtil.now()); + WQLObject deviceRepairRequest = WQLObject.getWQLObject("EM_BI_DeviceRepairRequest"); + deviceRepairRequest.update(param,"request_id in (\'"+requestId+"\')"); + result.put("code", "1"); + result.put("desc", "更新成功"); + }catch (Exception ex){ + result.put("code", "0"); + result.put("desc", "更新失败"); + log.error("updateWarnTime error:{}",ex.getMessage()); + } + } + return result; + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/impl/DevicerunrecordServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/impl/DevicerunrecordServiceImpl.java index 8ea85bd1..af8f92cd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/impl/DevicerunrecordServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/impl/DevicerunrecordServiceImpl.java @@ -284,7 +284,7 @@ public class DevicerunrecordServiceImpl implements DevicerunrecordService { JSONObject jsonFile = WQLObject.getWQLObject("EM_BI_EquipmentFile").query("devicerecord_id = '" + devicerecord_id + "'").uniqueResult(0); String status = jsonFile.getString("status"); if (!"10,11,20,30,40".contains(status)) { - throw new BadRequestException("此设备不能填报"); + throw new BadRequestException("此设备状态不正确,设备不能填报"); } double run_times = whereJson.getDoubleValue("run_times"); //生产时间 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/rest/DevicesafetyqtyqueryController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/rest/DevicesafetyqtyqueryController.java index d8d8c6c9..797dd0c3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/rest/DevicesafetyqtyqueryController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/rest/DevicesafetyqtyqueryController.java @@ -41,6 +41,13 @@ public class DevicesafetyqtyqueryController { return new ResponseEntity<>(devicesafetyqtyqueryService.queryAll(whereJson, page), HttpStatus.OK); } + @GetMapping("/query2") + @Log("备件安全库存查询") + @ApiOperation("备件安全库存查询") + public ResponseEntity query2(@RequestParam Map whereJson, Pageable page) { + return new ResponseEntity<>(devicesafetyqtyqueryService.queryAll2(whereJson, page), HttpStatus.OK); + } + @PostMapping @Log("新增备件安全库存查询") @ApiOperation("新增备件安全库存查询") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/DevicesafetyqtyqueryService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/DevicesafetyqtyqueryService.java index fdc54264..50c7d2b6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/DevicesafetyqtyqueryService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/DevicesafetyqtyqueryService.java @@ -24,6 +24,14 @@ public interface DevicesafetyqtyqueryService { * @return Map */ Map queryAll(Map whereJson, Pageable page); + /** + * 查询数据分页 + * + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map queryAll2(Map whereJson, Pageable page); /** * 查询所有数据不分页 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicesafetyqtyqueryServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicesafetyqtyqueryServiceImpl.java index 38fa8973..17315e71 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicesafetyqtyqueryServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicesafetyqtyqueryServiceImpl.java @@ -15,6 +15,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.exception.BadRequestException; import org.nl.utils.FileUtil; import org.nl.utils.SecurityUtils; +import org.nl.wms.basedata.master.constant.MaterOptTypeEnum; import org.nl.wms.basedata.master.service.ClassstandardService; import org.nl.wms.sb.stat.service.DevicesafetyqtyqueryService; import org.nl.wms.sb.stat.service.DevicesparepartivtService; @@ -48,7 +49,9 @@ public class DevicesafetyqtyqueryServiceImpl implements DevicesafetyqtyqueryServ String material_code = MapUtil.getStr(whereJson, "material_code"); String type = MapUtil.getStr(whereJson, "type"); String is_all = MapUtil.getStr(whereJson, "is_all"); - + if(StrUtil.isEmpty(class_idStr)){ + class_idStr = MaterOptTypeEnum.SPARE.getClass_idStr(); + } HashMap map = new HashMap<>(); map.put("flag", "1"); map.put("type",type); @@ -63,7 +66,35 @@ public class DevicesafetyqtyqueryServiceImpl implements DevicesafetyqtyqueryServ String classIds = classstandardService.getAllChildIdStr(class_idStr); map.put("classIds", classIds); } - JSONObject json = WQL.getWO("EM_DEVICESAFETQTYQUERY001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "a.material_id DESC"); + JSONObject json = WQL.getWO("EM_DEVICESAFETQTYQUERY001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "a.material_code"); + return json; + } + + @Override + public Map queryAll2(Map whereJson, Pageable page) { + String material_type_id = MapUtil.getStr(whereJson, "material_type_id"); + String class_idStr = (String) whereJson.get("class_idStr"); + String material_code = MapUtil.getStr(whereJson, "material_code"); + String type = MapUtil.getStr(whereJson, "type"); + String is_all = MapUtil.getStr(whereJson, "is_all"); + if(StrUtil.isEmpty(class_idStr)){ + class_idStr = MaterOptTypeEnum.BCP_AND_YL_AND_FL.getClass_idStr(); + } + HashMap map = new HashMap<>(); + map.put("flag", "2"); + map.put("type",type); + map.put("is_all",is_all); + if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code", "%"+material_code+"%"); + //处理物料当前节点的所有子节点 + if (StrUtil.isNotEmpty(material_type_id)) { + map.put("material_type_id", material_type_id); + String classIds = classstandardService.getChildIdStr(material_type_id); + map.put("classIds", classIds); + } else if (ObjectUtil.isNotEmpty(class_idStr)) { + String classIds = classstandardService.getAllChildIdStr(class_idStr); + map.put("classIds", classIds); + } + JSONObject json = WQL.getWO("EM_DEVICESAFETQTYQUERY001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "a.material_code"); return json; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICESAFETQTYQUERY001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICESAFETQTYQUERY001.wql index 5ec610af..78cfaa8c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICESAFETQTYQUERY001.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICESAFETQTYQUERY001.wql @@ -113,4 +113,71 @@ ENDSELECT ENDPAGEQUERY - ENDIF \ No newline at end of file + ENDIF + + IF 输入.flag = "2" + PAGEQUERY + SELECT + a.material_id, + a.material_code, + a.material_name, + a.class_name, + a.safe_ivt_down, + a.ivt_qty, + a.qty_unit_name + FROM + ( + SELECT + mater.material_id, + mater.material_code, + mater.material_name, + class.class_name, + ( + CASE + WHEN fivt.safe_ivt_down is null THEN 0 ELSE fivt.safe_ivt_down + END + ) AS safe_ivt_down, + ( + CASE + WHEN pivt.ivt_qty is null THEN 0 ELSE pivt.ivt_qty + END + ) AS ivt_qty, + unit.unit_name AS qty_unit_name + FROM + md_me_materialbase mater + LEFT JOIN md_pb_classstandard class ON mater.material_type_id = class.class_id + LEFT JOIN ST_IVT_MaterialSafeIvt fivt ON fivt.material_id = mater.material_id + LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = mater.base_unit_id + LEFT JOIN ( + SELECT + SUM(ivt.ivt_qty) AS ivt_qty, + ivt.material_id + FROM + st_ivt_structivt ivt + WHERE + 1=1 + group by ivt.material_id + ) pivt ON pivt.material_id = mater.material_id + WHERE + 1=1 + + OPTION 输入.classIds <> "" + class.class_id in 输入.classIds + ENDOPTION + + OPTION 输入.material_code <> "" + (mater.material_code like 输入.material_code or + mater.material_name like 输入.material_code) + ENDOPTION + ) AS a + + WHERE + 1=1 + + OPTION 输入.is_all <> "0" + a.safe_ivt_down > a.ivt_qty + ENDOPTION + + ENDSELECT + ENDPAGEQUERY + ENDIF 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 a8c1763d..3056e629 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 @@ -260,6 +260,7 @@ IF 输入.flag = "4" QUERY SELECT + mst.repair_id as id, mst.input_time AS input_time, mst.repair_code AS repair_code, ( @@ -312,6 +313,7 @@ UNION SELECT + st.request_id AS id, st.create_time AS input_time, st.request_code AS repair_code, class.class_name AS maintenancecycle, @@ -357,8 +359,8 @@ END ) AS fault_level, mst.update_optname AS user_name, - mst.fault_desc AS fault_desc, - mst.invstatus AS status + st.fault_desc AS fault_desc, + st.status AS status FROM EM_BI_DeviceRepairRequest st LEFT JOIN EM_BI_EquipmentFile file ON st.devicerecord_id = file.devicerecord_id @@ -368,11 +370,12 @@ WHERE st.is_delete = '0' AND (st.status <> '99') - AND mst.invstatus not in ('06','07','99') + AND (mst.invstatus not in ('06','07','99') or isnull(mst.invstatus)) UNION SELECT + mst.maint_id as id, mst.input_time AS input_time, mst.maint_code AS repair_code, ( diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java index aa0f2955..56d0e24b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java @@ -87,7 +87,7 @@ public class TaskController { } //增加未完成状态 JSONObject unFinish = new JSONObject(); - unFinish.put("code", "-1"); + unFinish.put("code", "11"); unFinish.put("name", "未完成"); arr.add(unFinish); return new ResponseEntity<>(arr, HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java index c94a6709..9118bd8a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java @@ -28,6 +28,7 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @author ldjun @@ -47,16 +48,29 @@ public class TaskServiceImpl implements TaskService { JSONObject whereJson = JSONObject.parseObject(JSON.toJSONString(form)); + String task_status_old = whereJson.getString("task_status"); String task_status = whereJson.getString("task_status"); - if (StrUtil.isNotEmpty(task_status)) { - task_status = task_status.replace("[\"", "").replace("\"]", "").replace("\"", ""); + + String task_status_new = ""; + if (StrUtil.isNotEmpty(task_status) && !"null".equals(task_status)) { + task_status = task_status.replace("11","01,02,03"); + String[] strs = task_status.split(","); + for( int i=0;i ((JSONObject) o).getString("taskdtl_id")).collect(Collectors.joining("\",\""))+"\")"; + map.put("flag", "2"); + map.put("materialIds", allmaterialId); + JSONArray currentArray = WQL.getWO("QSCH_TASK_01").addParamMap(map).process().getResultJSONArray(0); + json.put("content",currentArray); + } return json; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql index 055a0118..aaeb4fa7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql @@ -14,7 +14,7 @@ ## 表字段对应输入参数 ################################################# 输入.flag TYPEAS s_string - 输入.task_status TYPEAS s_string + 输入.task_status TYPEAS f_string 输入.finished_type TYPEAS s_string 输入.task_type TYPEAS s_string 输入.start_point_code TYPEAS s_string @@ -25,6 +25,7 @@ 输入.end_time TYPEAS s_string 输入.unFinish TYPEAS s_string 输入.taskdtl_type TYPEAS s_string + 输入.materialIds TYPEAS f_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -51,21 +52,9 @@ IF 输入.flag = "1" PAGEQUERY SELECT - task.*, - p1.point_name AS start_point_name, - d1.label AS start_area_name, - p2.point_name AS next_point_name, - d2.label AS next_area_name, - d3.label AS task_type_name, - d4.label AS taskdtl_type_name + task.taskdtl_id FROM sch_base_task task - LEFT JOIN sch_base_point p1 ON task.start_point_code = p1.point_code - LEFT JOIN sys_dict_detail d1 ON d1.`value` = p1.area_type AND d1.`name` = 'sch_area_type' - LEFT JOIN sch_base_point p2 ON task.next_point_code = p2.point_code - LEFT JOIN sys_dict_detail d2 ON d2.`value` = p2.area_type AND d2.`name` = 'sch_area_type' - LEFT JOIN sys_dict_detail d3 ON d3.`value` = task.task_type AND d3.`name` = 'SCH_TASK_TYPE' - LEFT JOIN sys_dict_detail d4 ON d4.`value` = task.taskdtl_type AND d4.`name` = 'SCH_TASK_TYPE_DTL' WHERE task.is_delete = '0' OPTION 输入.task_type <> "" @@ -87,7 +76,7 @@ task.task_status <> '99' ENDOPTION OPTION 输入.task_status <> "" - find_in_set( task.task_status, 输入.task_status) + task.task_status in 输入.task_status ENDOPTION OPTION 输入.vehicle_code <> "" (task.vehicle_code like 输入.vehicle_code) @@ -110,3 +99,30 @@ ENDSELECT ENDPAGEQUERY ENDIF + + IF 输入.flag = "2" + QUERY + SELECT + task.*, + p1.point_name AS start_point_name, + d1.label AS start_area_name, + p2.point_name AS next_point_name, + d2.label AS next_area_name, + d3.label AS task_type_name, + d4.label AS taskdtl_type_name + FROM + sch_base_task task + LEFT JOIN sch_base_point p1 ON task.start_point_code = p1.point_code + LEFT JOIN sys_dict_detail d1 ON d1.`value` = p1.area_type AND d1.`name` = 'sch_area_type' + LEFT JOIN sch_base_point p2 ON task.next_point_code = p2.point_code + LEFT JOIN sys_dict_detail d2 ON d2.`value` = p2.area_type AND d2.`name` = 'sch_area_type' + LEFT JOIN sys_dict_detail d3 ON d3.`value` = task.task_type AND d3.`name` = 'SCH_TASK_TYPE' + LEFT JOIN sys_dict_detail d4 ON d4.`value` = task.taskdtl_type AND d4.`name` = 'SCH_TASK_TYPE_DTL' + WHERE + task.is_delete = '0' + OPTION 输入.materialIds <> "" + task.taskdtl_id in 输入.materialIds + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java index b5035cc9..8789582f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java @@ -90,10 +90,18 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } JSONObject jo = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "bill_code desc"); JSONArray json = jo.getJSONArray("content"); - map.put("flag", "11"); - JSONObject jo2 = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).process().uniqueResult(0); - jo2.put("bill_code","合计"); - json.add(jo2); + map.put("flag", "01"); + JSONArray jo2 = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).process().getResultJSONArray(1); + + if(jo2.size()!=0){ + JSONObject jo3 = jo2.getJSONObject(0); + jo3.put("bill_code","合计"); + json.add(jo3); + }else{ + JSONObject jo3 = new JSONObject(); + jo3.put("stor_name","合计"); + json.add(jo3); + } jo.put("content",json); return jo; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL.wql index 477da117..c6ed75dc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL.wql @@ -125,7 +125,7 @@ ENDPAGEQUERY ENDIF - IF 输入.flag = "11" + IF 输入.flag = "01" QUERY SELECT sum(outq.total_qty) AS total_qty diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java index c95ee004..60d25c2a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java @@ -58,7 +58,7 @@ public class IostordailyServiceImpl implements IostordailyService { map.put("material_code", "%" + material_code + "%"); } if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn", "%" + pcsn + "%"); - JSONObject json = WQL.getWO("SendReceiveQuery_query_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "da.sect_date desc"); + JSONObject json = WQL.getWO("SendReceiveQuery_query_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mater.material_code"); /* @@ -85,17 +85,16 @@ public class IostordailyServiceImpl implements IostordailyService { JSONObject jsonWork = workTab.query("material_id = '" + material_id + "' and pcsn = '" + pcsn_1 + "' and is_delete ='0'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonWork)) { ja.add(jsonObject); - continue; + }else{ + JSONObject jsonDept = deptTab.query("dept_id = '" + jsonWork.getString("org_id") + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(jsonDept)) { + jsonObject.put("dept_name", jsonDept.getString("name")); + ja.add(jsonObject); + }else{ + ja.add(jsonObject); + } } - - JSONObject jsonDept = deptTab.query("dept_id = '" + jsonWork.getString("org_id") + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonDept)) { - jsonObject.put("dept_name", jsonDept.getString("name")); - ja.add(jsonObject); - } - } - - if (is_rf) { + }else if (is_rf) { // 截取 "-" 最后出现的前面的字符串 String material_code_1 = jsonObject.getString("material_code"); int lastIndexOf = material_code_1.lastIndexOf('-'); @@ -104,24 +103,36 @@ public class IostordailyServiceImpl implements IostordailyService { JSONArray workArr = WQL.getWO("SendReceiveQuery_query_01").addParam("flag", "3").addParam("material_code", material_code_sub).process().getResultJSONArray(0); if (ObjectUtil.isEmpty(workArr)) { ja.add(jsonObject); - continue; - } - if (workArr.size() > 1) { - jsonObject.put("is_yellow", "1"); - JSONObject json_1 = workArr.getJSONObject(0); - jsonObject.put("dept_name",json_1.getString("dept_name")); - ja.add(jsonObject); - } else { - JSONObject json_1 = workArr.getJSONObject(0); - jsonObject.put("dept_name",json_1.getString("dept_name")); - ja.add(jsonObject); + }else{ + if (workArr.size() > 1) { + jsonObject.put("is_yellow", "1"); + JSONObject json_1 = workArr.getJSONObject(0); + jsonObject.put("dept_name",json_1.getString("dept_name")); + ja.add(jsonObject); + } else if (workArr.size() == 1) { + JSONObject json_1 = workArr.getJSONObject(0); + jsonObject.put("dept_name",json_1.getString("dept_name")); + ja.add(jsonObject); + }else{ + ja.add(jsonObject); + } } + }else{ + ja.add(jsonObject); } } - map.put("flag", "11"); - JSONObject jo2 = WQL.getWO("SendReceiveQuery_query_01").addParamMap(map).process().uniqueResult(0); - jo2.put("stor_name","合计"); - ja.add(jo2); + map.put("flag", "01"); + JSONArray jo2 = WQL.getWO("SendReceiveQuery_query_01").addParamMap(map).process().getResultJSONArray(1); + if(jo2.size()!=0){ + JSONObject jo3 = jo2.getJSONObject(0); + jo3.put("stor_name","合计"); + ja.add(jo3); + }else{ + JSONObject jo3 = new JSONObject(); + jo3.put("stor_name","合计"); + ja.add(jo3); + } + json.put("content",ja); return json; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IvtQueryServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IvtQueryServiceImpl.java index a625fb0a..2fd8e3ee 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IvtQueryServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IvtQueryServiceImpl.java @@ -65,12 +65,20 @@ public class IvtQueryServiceImpl implements IvtQueryService { map.put("sects",str); } } - JSONObject jo = WQL.getWO("Qivt_query_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ivt.instorage_time desc"); + JSONObject jo = WQL.getWO("Qivt_query_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "me.material_code,me.material_name"); JSONArray json = jo.getJSONArray("content"); - map.put("flag", "11"); - JSONObject jo2 = WQL.getWO("Qivt_query_01").addParamMap(map).process().uniqueResult(0); - jo2.put("stor_name","合计"); - json.add(jo2); + map.put("flag", "01"); + JSONArray jo2 = WQL.getWO("Qivt_query_01").addParamMap(map).process().getResultJSONArray(1); + + if(jo2.size()!=0){ + JSONObject jo3 = jo2.getJSONObject(0); + jo3.put("stor_name","合计"); + json.add(jo3); + }else{ + JSONObject jo3 = new JSONObject(); + jo3.put("stor_name","合计"); + json.add(jo3); + } jo.put("content",json); return jo; } 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 e162c32e..1cc6e866 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 @@ -25,7 +25,9 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor @@ -48,12 +50,20 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { } - JSONObject jo = WQL.getWO("statistical_report_query_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time desc"); + JSONObject jo = WQL.getWO("statistical_report_query_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "material_code"); JSONArray json = jo.getJSONArray("content"); - map.put("flag", "11"); - JSONObject jo2 = WQL.getWO("statistical_report_query_01").addParamMap(map).process().uniqueResult(0); - jo2.put("material_code","合计"); - json.add(jo2); + map.put("flag", "01"); + JSONArray jo2 = WQL.getWO("statistical_report_query_01").addParamMap(map).process().getResultJSONArray(1); + + if(jo2.size()!=0){ + JSONObject jo3 = jo2.getJSONObject(0); + jo3.put("material_code","合计"); + json.add(jo3); + }else{ + JSONObject jo3 = new JSONObject(); + jo3.put("material_code","合计"); + json.add(jo3); + } jo.put("content",json); return jo; } @@ -80,12 +90,19 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { if (StrUtil.isNotEmpty(map.get("material_code"))) { map.put("material_code", "%" + map.get("material_code") + "%"); } - JSONObject jo = WQL.getWO("statistical_report_query_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "bill_code desc"); + JSONObject jo = WQL.getWO("statistical_report_query_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mb.material_name"); JSONArray json = jo.getJSONArray("content"); - map.put("flag", "22"); - JSONObject jo2 = WQL.getWO("statistical_report_query_01").addParamMap(map).process().uniqueResult(0); - jo2.put("biz_date","合计"); - json.add(jo2); + map.put("flag", "02"); + JSONArray jo2 = WQL.getWO("statistical_report_query_01").addParamMap(map).process().getResultJSONArray(1); + if(jo2.size()!=0){ + JSONObject jo3 = jo2.getJSONObject(0); + jo3.put("biz_date","合计"); + json.add(jo3); + }else{ + JSONObject jo3 = new JSONObject(); + jo3.put("biz_date","合计"); + json.add(jo3); + } jo.put("content",json); return jo; } @@ -98,7 +115,6 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { String org_id = MapUtil.getStr(whereJson, "org_id"); Date date1 = DateUtil.parse(begin_time); Date date2 = DateUtil.parse(end_time); - long betweenDay = DateUtil.between(date1, date2, DateUnit.DAY); JSONArray rows = new JSONArray(); JSONArray mater_rows = WQL.getWO("statistical_report_query_01").addParam("flag", "3").process().getResultJSONArray(0); JSONObject jo1 = new JSONObject(); @@ -136,16 +152,33 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { JSONObject form_qty = dtlJa.getJSONObject(i); dtlJa_map.put(form_qty.getString("material_id"),form_qty.getDouble("qty")); } + //库存物料数量 + JSONArray materQryArray = WQL.getWO("statistical_report_query_01").addParam("flag", "4").process().getResultJSONArray(0); + Map> materialMap = materQryArray.stream().collect(Collectors.groupingBy(a -> ((JSONObject)a).getString("material_id"))); + //排产需求 + JSONArray needMaterArray = WQL.getWO("statistical_report_query_01").addParam("flag", "6").addParam("begin_time", begin_time).addParam("end_time", end_time).addParam("org_id", org_id).process().getResultJSONArray(0); + Map> needMaterMap = needMaterArray.stream().collect(Collectors.groupingBy(a -> ((JSONObject)a).getString("material_id"))); + + //3、待检入库量：sum(此物料未确认的到货单的单据数-入库数) + JSONArray noinJoArray = WQL.getWO("statistical_report_query_01").addParam("flag", "77").process().getResultJSONArray(0); + Map> noinJoMap = noinJoArray.stream().collect(Collectors.groupingBy(a -> ((JSONObject)a).getString("material_id"))); + + //查询物料计划日期内的需求量 + JSONArray DataPlanQtyArray = WQL.getWO("statistical_report_query_01").addParam("flag", "10") + .addParam("begin_time", begin_time.substring(0, 10) + "%") + .addParam("end_time", end_time.substring(0, 10) + "%").process().getResultJSONArray(0); + Map> datePlanMap = DataPlanQtyArray.stream().collect(Collectors.groupingBy(a -> ((JSONObject)a).getString("material_id"))); + for (int i = 0; i < mater_rows.size(); i++) { JSONObject mater = mater_rows.getJSONObject(i); String material_id = mater.getString("material_id"); //1、库存现存量：现有库存 - JSONObject mater_ivt = WQL.getWO("statistical_report_query_01").addParam("flag", "4").addParam("material_id", material_id).process().uniqueResult(0); double now_ivt = 0; double need_qty = 0; - if (ObjectUtil.isNotEmpty(mater_ivt)) { - now_ivt = mater_ivt.getDoubleValue("qty"); + List materInfo = materialMap.get(material_id); + if (ObjectUtil.isNotEmpty(materInfo)) { + now_ivt = ((JSONObject) materInfo.get(0)).getDoubleValue("qty"); } if (dtlJa_map.containsKey(material_id)) { need_qty = dtlJa_map.get(material_id); @@ -157,19 +190,20 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { //已开单重量 jo22.put(material_id, String.format("%.2f", need_qty)); //2、排产需求量(未开工的工令重量+排产未生成工令日计划重量)根据bom计算需要多少原料库存重量： - JSONObject nedd_mater = WQL.getWO("statistical_report_query_01").addParam("flag", "6").addParam("material_id", material_id).addParam("begin_time", begin_time).addParam("end_time", end_time).addParam("org_id", org_id).process().uniqueResult(0); +// JSONObject nedd_mater = WQL.getWO("statistical_report_query_01").addParam("flag", "6").addParam("material_id", material_id).addParam("begin_time", begin_time).addParam("end_time", end_time).addParam("org_id", org_id).process().uniqueResult(0); double bom_qty = 0; - if (ObjectUtil.isNotEmpty(nedd_mater)) { - bom_qty = nedd_mater.getDoubleValue("qty"); + List needMaterInfo = needMaterMap.get(material_id); + if (ObjectUtil.isNotEmpty(needMaterInfo)) { + bom_qty = ((JSONObject) needMaterInfo.get(0)).getDoubleValue("qty"); } jo2.put(material_id, String.format("%.2f", bom_qty)); //3、待检入库量：sum(此物料未确认的到货单的单据数-入库数) - JSONObject noin_jo = WQL.getWO("statistical_report_query_01").addParam("flag", "77").addParam("material_id", material_id).process().uniqueResult(0); //待检+未入库数量 double noin_qty = 0; - if (ObjectUtil.isNotEmpty(noin_jo)) { - noin_qty = noin_jo.getDoubleValue("noin_qty"); + List noinJoInfo = noinJoMap.get(material_id); + if (ObjectUtil.isNotEmpty(noinJoInfo)) { + noin_qty = ((JSONObject) noinJoInfo.get(0)).getDoubleValue("noin_qty"); } jo4.put(material_id, String.format("%.2f", noin_qty)); @@ -187,7 +221,6 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { map.put("flag", "4"); map.put("ext_id", jsonMater.getString("ext_id")); JSONObject num_jo = WQL.getWO("QL_ERP").addParamMap(map).setDbname("dataSource1").process().uniqueResult(0); - //合同在途 double notqty = 0; if (ObjectUtil.isNotEmpty(num_jo)) { @@ -217,24 +250,41 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { if (canuse_num<0){ jo5.put(material_id, DateUtil.offsetDay(date1, -1).toString().substring(0, 10)); }else { - for (int j = 1; j <= betweenDay; j++) { - DateTime newDate = DateUtil.offsetDay(date1, j); - //查询该物料当天的需求量 - JSONObject today_qty = WQL.getWO("statistical_report_query_01").addParam("flag", "8").addParam("material_id", material_id).addParam("begin_time", newDate.toString().substring(0, 10) + "%").process().uniqueResult(0); - double need_weight = 0; - if (ObjectUtil.isNotEmpty(today_qty)) { - need_weight = today_qty.getDoubleValue("qty"); - } - if (canuse_num < need_weight) { - jo5.put(material_id, DateUtil.offsetDay(newDate, -1).toString().substring(0, 10)); - break; - } else { - canuse_num -= need_weight; - } - if (j == betweenDay) { - jo5.put(material_id, end_time.substring(0, 10)); + List materDataPlanQty = datePlanMap.get(material_id); + double needWeight; + jo5.put(material_id, end_time.substring(0, 10)); + if (ObjectUtil.isNotEmpty(materDataPlanQty)){ + for (Object todayQty : materDataPlanQty) { + JSONObject jsonQty = (JSONObject) todayQty; + needWeight = jsonQty.getDoubleValue("qty"); + Date currentDate = ((JSONObject) todayQty).getDate("currentdate"); + if (canuse_num < needWeight) { + jo5.put(material_id, DateUtil.offsetDay(currentDate, -1).toString().substring(0, 10)); + break; + } else { + canuse_num -= needWeight; + } } } + +// for (int j = 1; j <= betweenDay; j++) { +// DateTime newDate = DateUtil.offsetDay(date1, j); +// //查询该物料当天的需求量 +// JSONObject today_qty = WQL.getWO("statistical_report_query_01").addParam("flag", "8").addParam("material_id", material_id).addParam("begin_time", newDate.toString().substring(0, 10) + "%").process().uniqueResult(0); +// double need_weight = 0; +// if (ObjectUtil.isNotEmpty(today_qty)) { +// need_weight = today_qty.getDoubleValue("qty"); +// } +// if (canuse_num < need_weight) { +// jo5.put(material_id, DateUtil.offsetDay(newDate, -1).toString().substring(0, 10)); +// break; +// } else { +// canuse_num -= need_weight; +// } +// if (j == betweenDay) { +// jo5.put(material_id, end_time.substring(0, 10)); +// } +// } } } JSONObject jo = new JSONObject(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/Qivt_query_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/Qivt_query_01.wql index dc320cde..374f0a58 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/Qivt_query_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/Qivt_query_01.wql @@ -144,7 +144,7 @@ ENDPAGEQUERY ENDIF - IF 输入.flag = "11" + IF 输入.flag = "01" QUERY SELECT sum(outq.bucket_num) AS bucket_num, diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/SendReceiveQuery_query_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/SendReceiveQuery_query_01.wql index bc111e1b..b868d1b5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/SendReceiveQuery_query_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/SendReceiveQuery_query_01.wql @@ -127,7 +127,7 @@ ENDPAGEQUERY ENDIF - IF 输入.flag = "11" + IF 输入.flag = "01" QUERY SELECT sum(outq.start_num) AS start_num, 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 da933e7d..ec90b5ff 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 @@ -99,7 +99,7 @@ ENDPAGEQUERY ENDIF - IF 输入.flag = "11" + IF 输入.flag = "01" QUERY SELECT sum(outq.qty) AS qty @@ -231,7 +231,7 @@ ENDPAGEQUERY ENDIF - IF 输入.flag = "22" + IF 输入.flag = "02" QUERY SELECT sum(outq.out_qty) AS out_qty, @@ -374,7 +374,7 @@ ENDOPTION ) a LEFT JOIN md_pd_productbom bom ON bom.material_id = a.material_id - LEFT JOIN md_pd_productbomdtl dtl ON dtl.bom_id = dtl.bom_id + LEFT JOIN md_pd_productbomdtl dtl ON dtl.bom_id = bom.bom_id LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id LEFT JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id ORDER BY order_no,material_code @@ -385,7 +385,7 @@ IF 输入.flag = "4" QUERY SELECT - SUM( canuse_qty ) AS qty + material_id,SUM( canuse_qty ) AS qty FROM st_ivt_structivt WHERE @@ -703,4 +703,103 @@ ENDQUERY ENDIF + IF 输入.flag = "10" + QUERY + SELECT + dtl.material_id, + b.currentDate, + ROUND((b.qty * dtl.standard_rate * 0.01),3) as qty + FROM ( + SELECT + material_id,SUM( qty ) AS qty,currentDate + FROM + ( + SELECT + material_id, + workorder_qty AS qty, + wo.planstart_time as currentDate + FROM + pdm_bi_workorder wo + WHERE wo.`status` < 50 AND is_delete = '0' + OPTION 输入.begin_time <> "" + wo.planstart_time >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + wo.planstart_time <= 输入.end_time + ENDOPTION + UNION ALL + SELECT + material_id, + product_weight AS qty, + planstart_date as currentDate + FROM + MPS_BD_ProductDailyPlan + WHERE `status` = '01' + OPTION 输入.begin_time <> "" + planstart_date >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + planstart_date <= 输入.end_time + ENDOPTION + ) a GROUP BY a.material_id,currentDate + ) b + LEFT JOIN md_pd_productbom mst ON mst.material_id = b.material_id + LEFT JOIN md_pd_productbomdtl dtl ON mst.bom_id = dtl.bom_id + WHERE + 1=1 order by currentDate + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "11" + QUERY + SELECT DISTINCT + mb.material_id, + mb.material_name, + mb.material_code, + class.parent_class_id, + (case when class.class_id = '1503644362192588800' then 1 + when class.class_id = '1503644361664106496' then 2 + when class.class_id = '1503644362788179968' then 4 + when class.class_id = '1503644362234531840' then 5 + else 3 end) AS order_no + FROM + ( + SELECT + wo.material_id + FROM + pdm_bi_workorder wo + WHERE + wo.is_delete = '0' + AND wo.`status` IN ( '10', '20', '30' ) + OPTION 输入.begin_time <> "" + wo.planstart_time >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + wo.planstart_time <= 输入.end_time + ENDOPTION + UNION + SELECT + plan.material_id + FROM + mps_bd_productdailyplan plan + WHERE + plan.`status` = '01' + OPTION 输入.begin_time <> "" + plan.planstart_date >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + plan.planstart_date <= 输入.end_time + ENDOPTION + ) a + LEFT JOIN md_pd_productbom bom ON bom.material_id = a.material_id + LEFT JOIN md_pd_productbomdtl dtl ON dtl.bom_id = dtl.bom_id + LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id + LEFT JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id + ORDER BY order_no,material_code + ENDSELECT + ENDQUERY + ENDIF + + diff --git a/mes/qd/src/components/IconSelect/index.vue b/mes/qd/src/components/IconSelect/index.vue index b0ec9fa1..d0612d9b 100644 --- a/mes/qd/src/components/IconSelect/index.vue +++ b/mes/qd/src/components/IconSelect/index.vue @@ -1,7 +1,7 @@ @@ -171,13 +171,6 @@ export default { type: Object } }, - watch: { - dialogShow: { - handler(newValue, oldValue) { - this.dialogVisible = newValue - } - } - }, data() { return { dialogVisible: false, @@ -202,6 +195,13 @@ export default { } } }, + watch: { + dialogShow: { + handler(newValue, oldValue) { + this.dialogVisible = newValue + } + } + }, methods: { [CRUD.HOOK.beforeSubmit]() { const arr = this.form.tableData diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancegrid/AddDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancegrid/AddDialog.vue index 7c48ee3e..31fec8f6 100644 --- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancegrid/AddDialog.vue +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancegrid/AddDialog.vue @@ -22,7 +22,7 @@ - + @@ -54,8 +54,8 @@ - - + + @@ -78,7 +78,7 @@ - + @@ -95,8 +95,8 @@ type="primary" icon="el-icon-check" size="mini" - @click="putItem" :disabled="crud.status.view > 0" + @click="putItem" > 添加项目 @@ -134,8 +134,8 @@ - - + + @@ -171,13 +171,6 @@ export default { type: Object } }, - watch: { - dialogShow: { - handler(newValue, oldValue) { - this.dialogVisible = newValue - } - } - }, data() { return { dialogVisible: false, @@ -202,6 +195,13 @@ export default { } } }, + watch: { + dialogShow: { + handler(newValue, oldValue) { + this.dialogVisible = newValue + } + } + }, methods: { [CRUD.HOOK.beforeSubmit]() { const arr = this.form.tableData diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/ExecuteDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/ExecuteDialog.vue index 104259e3..852ffd45 100644 --- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/ExecuteDialog.vue +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/ExecuteDialog.vue @@ -25,7 +25,7 @@ - + @@ -57,12 +57,12 @@ - + - + @@ -70,7 +70,7 @@ - + @@ -136,6 +136,14 @@ export default { type: Object } }, + data() { + return { + form: { + tableData: [] + }, + dialogVisible: false + } + }, watch: { dialogShow: { handler(newValue, oldValue) { @@ -145,14 +153,6 @@ export default { } } }, - data() { - return { - form: { - tableData: [] - }, - dialogVisible: false - } - }, methods: { handleClose(done) { this.$confirm('确认关闭？') diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/StartDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/StartDialog.vue index 03e92d58..703abeea 100644 --- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/StartDialog.vue +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/StartDialog.vue @@ -12,7 +12,7 @@ - + @@ -41,6 +41,13 @@ export default { type: Object } }, + data() { + return { + form4: { + }, + dialogVisible: false + } + }, watch: { dialogShow: { handler(newValue, oldValue) { @@ -49,13 +56,6 @@ export default { } } }, - data() { - return { - form4: { - }, - dialogVisible: false - } - }, methods: { handleClose(done) { this.$confirm('确认关闭？') diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/ExecuteDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/ExecuteDialog.vue index 104259e3..852ffd45 100644 --- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/ExecuteDialog.vue +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/ExecuteDialog.vue @@ -25,7 +25,7 @@ - + @@ -57,12 +57,12 @@ - + - + @@ -70,7 +70,7 @@ - + @@ -136,6 +136,14 @@ export default { type: Object } }, + data() { + return { + form: { + tableData: [] + }, + dialogVisible: false + } + }, watch: { dialogShow: { handler(newValue, oldValue) { @@ -145,14 +153,6 @@ export default { } } }, - data() { - return { - form: { - tableData: [] - }, - dialogVisible: false - } - }, methods: { handleClose(done) { this.$confirm('确认关闭？') diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog.vue index 03e92d58..703abeea 100644 --- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog.vue +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog.vue @@ -12,7 +12,7 @@ - + @@ -41,6 +41,13 @@ export default { type: Object } }, + data() { + return { + form4: { + }, + dialogVisible: false + } + }, watch: { dialogShow: { handler(newValue, oldValue) { @@ -49,13 +56,6 @@ export default { } } }, - data() { - return { - form4: { - }, - dialogVisible: false - } - }, methods: { handleClose(done) { this.$confirm('确认关闭？') diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/AddDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/AddDialog.vue index ed085754..57a219e5 100644 --- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/AddDialog.vue +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/AddDialog.vue @@ -22,7 +22,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -105,7 +105,7 @@ > 添加项目 - - - + - - - + - + - + 完成 - - - - @@ -238,7 +229,7 @@ export default { sort: 'taskdtl_id,desc', crudMethod: { ...crudTask }, query: { - task_code:'',vehicle_code:'',start_point_code:'',next_point_code:'',task_type:'',taskdtl_type:'',finished_type:'',task_status:"" + task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', taskdtl_type: '', finished_type: '', task_status: '', status:'' }, optShow: { add: false, @@ -257,9 +248,11 @@ export default { currentComponent: '', openParam: {}, create_time: [], + task_status: [], taskStatusList: [], taskTypeList: [], finishTypeList: [], + flag1: true, permission: { }, @@ -276,16 +269,34 @@ export default { crudTask.getFinishType().then(data => { this.finishTypeList = data }) - this.crud.query.task_status = ['-1'] + this.crud.query.status = ['11'] + this.crud.query.task_status = '11' this.crud.toQuery() }, methods: { + [CRUD.HOOK.beforeRefresh]() { + if (this.flag1) { + this.crud.query.status = ['11'] + this.crud.query.task_status = '11' + this.flag1 = false + } + }, hand(value) { this.crud.toQuery() }, handTaskStatus(value) { + var str1 = '' if (value) { - this.query.task_status = this.task_status.toString() + for (const item of value) { + if (str1 === '') { + str1 = item + } else { + str1 = str1 + ',' + item + } + } + this.query.task_status = str1 + } else { + this.query.task_status = '' } this.crud.toQuery() }, diff --git a/mes/qd/src/views/wms/st/core/inbill/backinbill/AddDialog.vue b/mes/qd/src/views/wms/st/core/inbill/backinbill/AddDialog.vue index bea675db..d37be379 100644 --- a/mes/qd/src/views/wms/st/core/inbill/backinbill/AddDialog.vue +++ b/mes/qd/src/views/wms/st/core/inbill/backinbill/AddDialog.vue @@ -11,22 +11,35 @@ > - + - 保存 + 保存 关闭 - + - + @@ -83,27 +96,38 @@ - + - + - + - +
- + - - - - + + + + - - - - - - - - + + + + + + + + diff --git a/mes/qd/src/views/wms/st/core/inbill/handle/AddDialog.vue b/mes/qd/src/views/wms/st/core/inbill/handle/AddDialog.vue index 93c5e00f..9c887879 100644 --- a/mes/qd/src/views/wms/st/core/inbill/handle/AddDialog.vue +++ b/mes/qd/src/views/wms/st/core/inbill/handle/AddDialog.vue @@ -24,7 +24,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -99,7 +99,7 @@ - + diff --git a/mes/qd/src/views/wms/st/core/inbill/rawassist/AddDialog.vue b/mes/qd/src/views/wms/st/core/inbill/rawassist/AddDialog.vue index 3d557f77..a2b8ddd4 100644 --- a/mes/qd/src/views/wms/st/core/inbill/rawassist/AddDialog.vue +++ b/mes/qd/src/views/wms/st/core/inbill/rawassist/AddDialog.vue @@ -24,7 +24,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -99,7 +99,7 @@ - + diff --git a/mes/qd/src/views/wms/st/core/inbill/rawassist/DivDialog.vue b/mes/qd/src/views/wms/st/core/inbill/rawassist/DivDialog.vue index 509522d8..4d2fc1b0 100644 --- a/mes/qd/src/views/wms/st/core/inbill/rawassist/DivDialog.vue +++ b/mes/qd/src/views/wms/st/core/inbill/rawassist/DivDialog.vue @@ -14,7 +14,7 @@ 入库分配 - + 关闭
@@ -51,23 +51,33 @@ - - - - - - - - - + + + + + + + + + - + - + @@ -130,7 +140,7 @@ - + - - - - - - - - - + + + + + + + + + - - + + diff --git a/mes/qd/src/views/wms/st/core/inbill/rawassist/StructUpdateDialog.vue b/mes/qd/src/views/wms/st/core/inbill/rawassist/StructUpdateDialog.vue index 2b906581..22e201e1 100644 --- a/mes/qd/src/views/wms/st/core/inbill/rawassist/StructUpdateDialog.vue +++ b/mes/qd/src/views/wms/st/core/inbill/rawassist/StructUpdateDialog.vue @@ -25,13 +25,13 @@ - + - + - + @@ -53,11 +53,11 @@ - + - + - + - + @@ -67,7 +67,7 @@ - + @@ -85,7 +85,7 @@ - +
@@ -105,9 +105,9 @@ @current-change="handleDtlCurrentChange" > - + - + @@ -135,13 +135,13 @@ > - + - + - - - + + + @@ -153,8 +153,8 @@ import { crud } from '@crud/crud' import checkoutbill from '@/api/wms/st/core/outbill/checkoutbill' -import crudStorattr from "@/api/wms/basedata/st/storattr"; -import crudRawAssist from "@/api/wms/st/core/inbill/rawassist"; +import crudStorattr from '@/api/wms/basedata/st/storattr' +import crudRawAssist from '@/api/wms/st/core/inbill/rawassist' export default { name: 'ViewDialog', @@ -179,7 +179,7 @@ export default { storlist: [], currentdtl: null, currentDis: {}, - form:{} + form: {} } }, watch: { diff --git a/mes/qd/src/views/wms/st/core/inbill/reback/AddDialog.vue b/mes/qd/src/views/wms/st/core/inbill/reback/AddDialog.vue index c0c78455..45e60300 100644 --- a/mes/qd/src/views/wms/st/core/inbill/reback/AddDialog.vue +++ b/mes/qd/src/views/wms/st/core/inbill/reback/AddDialog.vue @@ -24,7 +24,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -100,7 +100,7 @@ - + diff --git a/mes/qd/src/views/wms/st/core/inbill/recycled/AddDialog.vue b/mes/qd/src/views/wms/st/core/inbill/recycled/AddDialog.vue index fec1018d..96cbf79d 100644 --- a/mes/qd/src/views/wms/st/core/inbill/recycled/AddDialog.vue +++ b/mes/qd/src/views/wms/st/core/inbill/recycled/AddDialog.vue @@ -24,7 +24,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -99,7 +99,7 @@ - + diff --git a/mes/qd/src/views/wms/st/core/inbill/wastewashinbill/AddDialog.vue b/mes/qd/src/views/wms/st/core/inbill/wastewashinbill/AddDialog.vue index 12333f87..934eab6c 100644 --- a/mes/qd/src/views/wms/st/core/inbill/wastewashinbill/AddDialog.vue +++ b/mes/qd/src/views/wms/st/core/inbill/wastewashinbill/AddDialog.vue @@ -24,7 +24,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -99,7 +99,7 @@ - + diff --git a/mes/qd/src/views/wms/st/core/outbill/backoutbill/AddDialog.vue b/mes/qd/src/views/wms/st/core/outbill/backoutbill/AddDialog.vue index 809b1828..296553b0 100644 --- a/mes/qd/src/views/wms/st/core/outbill/backoutbill/AddDialog.vue +++ b/mes/qd/src/views/wms/st/core/outbill/backoutbill/AddDialog.vue @@ -25,7 +25,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -100,7 +100,7 @@ - + diff --git a/mes/qd/src/views/wms/st/core/outbill/checkoutbill/AddDialog.vue b/mes/qd/src/views/wms/st/core/outbill/checkoutbill/AddDialog.vue index 787d85dd..3906139f 100644 --- a/mes/qd/src/views/wms/st/core/outbill/checkoutbill/AddDialog.vue +++ b/mes/qd/src/views/wms/st/core/outbill/checkoutbill/AddDialog.vue @@ -25,7 +25,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -100,7 +100,7 @@ - + diff --git a/mes/qd/src/views/wms/st/core/outbill/checkoutbill/DivDialog.vue b/mes/qd/src/views/wms/st/core/outbill/checkoutbill/DivDialog.vue index 21d4cc36..9de864fa 100644 --- a/mes/qd/src/views/wms/st/core/outbill/checkoutbill/DivDialog.vue +++ b/mes/qd/src/views/wms/st/core/outbill/checkoutbill/DivDialog.vue @@ -141,7 +141,7 @@ /> - + diff --git a/mes/qd/src/views/wms/st/core/outbill/checkoutbill/ViewDialog.vue b/mes/qd/src/views/wms/st/core/outbill/checkoutbill/ViewDialog.vue index 726d477e..d67f835e 100644 --- a/mes/qd/src/views/wms/st/core/outbill/checkoutbill/ViewDialog.vue +++ b/mes/qd/src/views/wms/st/core/outbill/checkoutbill/ViewDialog.vue @@ -8,10 +8,10 @@ @close="close" @open="open" > - + - + @@ -67,7 +67,7 @@ - + @@ -85,7 +85,7 @@ - +
@@ -105,9 +105,9 @@ @current-change="handleDtlCurrentChange" > - + - + @@ -135,13 +135,13 @@ > - + - + - - - + + + @@ -153,8 +153,8 @@ import { crud } from '@crud/crud' import checkoutbill from '@/api/wms/st/core/outbill/checkoutbill' -import crudStorattr from "@/api/wms/basedata/st/storattr"; -import crudRawAssist from "@/api/wms/st/core/inbill/rawassist"; +import crudStorattr from '@/api/wms/basedata/st/storattr' +import crudRawAssist from '@/api/wms/st/core/inbill/rawassist' export default { name: 'ViewDialog', @@ -179,7 +179,7 @@ export default { storlist: [], currentdtl: null, currentDis: {}, - form:{} + form: {} } }, watch: { diff --git a/mes/qd/src/views/wms/st/core/outbill/handoutbill/AddDialog.vue b/mes/qd/src/views/wms/st/core/outbill/handoutbill/AddDialog.vue index b6bf190f..0c9d92dc 100644 --- a/mes/qd/src/views/wms/st/core/outbill/handoutbill/AddDialog.vue +++ b/mes/qd/src/views/wms/st/core/outbill/handoutbill/AddDialog.vue @@ -25,7 +25,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -100,7 +100,7 @@ - +
diff --git a/mes/qd/src/views/wms/st/core/outbill/otheroutbill/AddDialog.vue b/mes/qd/src/views/wms/st/core/outbill/otheroutbill/AddDialog.vue index 714f58f6..2eea012f 100644 --- a/mes/qd/src/views/wms/st/core/outbill/otheroutbill/AddDialog.vue +++ b/mes/qd/src/views/wms/st/core/outbill/otheroutbill/AddDialog.vue @@ -25,7 +25,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -101,7 +101,7 @@ - +
@@ -141,7 +141,7 @@ - + diff --git a/mes/qd/src/views/wms/st/inStor/moreOrless/AddDialog.vue b/mes/qd/src/views/wms/st/inStor/moreOrless/AddDialog.vue index c8b2a790..74dfc42b 100644 --- a/mes/qd/src/views/wms/st/inStor/moreOrless/AddDialog.vue +++ b/mes/qd/src/views/wms/st/inStor/moreOrless/AddDialog.vue @@ -24,7 +24,7 @@ - + @@ -63,13 +63,13 @@ - + - + @@ -84,7 +84,7 @@ - + @@ -243,7 +243,7 @@ - + diff --git a/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/AddDialog.vue b/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/AddDialog.vue index 2334f445..e8eb95a8 100644 --- a/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/AddDialog.vue +++ b/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/AddDialog.vue @@ -25,7 +25,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -93,11 +93,11 @@ /> - + - + @@ -129,7 +129,7 @@ :header-cell-style="{background:'#f5f7fa',color:'#606266'}" > - + @@ -150,7 +150,7 @@ {{ scope.row.turnin_struct_code }} - + +