From 901a7443ee279f9db8a957a11f37e77931308390 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 14 Oct 2022 18:34:07 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DeviceBigScreenServiceImpl.java | 20 +++++++++++-- .../bigscreen/wql/EM_DEVICEBIGSCREEN_01.wql | 28 ++++++++++++++----- .../wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql | 4 +-- 3 files changed, 41 insertions(+), 11 deletions(-) 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 3da0b64b..968e6b5b 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 @@ -243,11 +243,16 @@ public class DeviceBigScreenServiceImpl implements DeviceBigScreenService { jsonObject.put("fault_num", fault_num.getString("num")); // 委外台数 - map.put("status", "30"); + map.put("flag", "10"); JSONObject out_num = WQL.getWO("EM_DEVICEBIGSCREEN_01").addParamMap(map).process().uniqueResult(0); - jsonObject.put("out_num", out_num.getString("num")); + if (ObjectUtil.isEmpty(out_num)) { + jsonObject.put("out_num", "0"); + } else { + jsonObject.put("out_num", String.valueOf(out_num.size())); + } // 保养台数 + map.put("flag", "5"); map.put("status", "40"); JSONObject main_num = WQL.getWO("EM_DEVICEBIGSCREEN_01").addParamMap(map).process().uniqueResult(0); jsonObject.put("main_num", main_num.getString("num")); @@ -328,12 +333,23 @@ public class DeviceBigScreenServiceImpl implements DeviceBigScreenService { /* * 查询保养单明细 */ + + WQLObject dtlTab = WQLObject.getWQLObject("em_bi_devicemaintenanceplandtl"); JSONObject resultJson = new JSONObject(); JSONObject resultData = new JSONObject(); JSONArray arr = WQL.getWO("EM_DEVICEBIGSCREEN_01").addParam("flag", "8").process().getResultJSONArray(0); for (int i = 0; i < arr.size(); i++) { JSONObject json = arr.getJSONObject(i); + + // 明细数 + JSONArray jsonDtl = dtlTab.query("maint_plan_id = '" + json.getString("maint_plan_id") + "'").getResultJSONArray(0); + if (ObjectUtil.isEmpty(jsonDtl)) { + json.put("num", "0"); + } else { + json.put("num", String.valueOf(jsonDtl.size())); + } + // 保养倒计时： 计划日期 - 当前日期 Date date1 = DateUtil.parse(DateUtil.today()); // 当前日期 Date date2 = DateUtil.parse(json.getString("plan_time")); // 计划日期 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/wql/EM_DEVICEBIGSCREEN_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/wql/EM_DEVICEBIGSCREEN_01.wql index b01d37a6..6421ccb0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/wql/EM_DEVICEBIGSCREEN_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/wql/EM_DEVICEBIGSCREEN_01.wql @@ -193,15 +193,9 @@ mst.real_start_date AS impl_time, mst.remark, mst.real_end_date, - dtl.num + mst.maint_plan_id FROM EM_BI_DeviceMaintenancePlanMst mst - LEFT JOIN - ( - SELECT count(*)AS num,d.maint_plan_id FROM EM_BI_DeviceMaintenancePlanDtl d - LEFT JOIN EM_BI_DeviceMaintenancePlanMst m ON m.maint_plan_id = d.maint_plan_id - GROUP BY d.maint_plan_dtl_id - ) AS dtl ON mst.maint_plan_id = dtl.maint_plan_id LEFT JOIN EM_BI_EquipmentFile file ON mst.devicerecord_id = file.devicerecord_id LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid WHERE @@ -227,3 +221,23 @@ ENDSELECT ENDQUERY ENDIF + + IF 输入.flag = "10" + QUERY + SELECT + count(mst.devicerecord_id) AS num + FROM + EM_BI_DeviceRepairMst mst + LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id + LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid + WHERE + mst.is_delete = '0' + AND file.is_delete = '0' + AND dept.code = 输入.dept_code + AND mst.invstatus = '04' + + group by mst.devicerecord_id + + ENDSELECT + ENDQUERY + 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 5bdf3e9e..c14ae17b 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 @@ -306,7 +306,7 @@ LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid WHERE mst.is_delete = '0' - AND (mst.invstatus <> '99') + AND mst.invstatus not in ('06','07','99') AND ( ISNULL( mst.source_bill_id ) OR mst.source_bill_type = 'WXJH' ) UNION @@ -416,7 +416,7 @@ LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid WHERE mst.is_delete = '0' - AND (mst.invstatus <> '99') + AND mst.invstatus not in ('04','05','99') order by input_time DESC From df0323aaa898bf7745b1fd9faa8c8c3c03fdc443 Mon Sep 17 00:00:00 2001 From: liuxy Date: Sat, 15 Oct 2022 16:06:23 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/MaterialParametersController.java | 7 + .../service/MaterialParametersService.java | 6 + .../impl/MaterialParametersServiceImpl.java | 147 ++++++++++++++++++ .../upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql | 4 +- .../wms/basedata/master/materialparameters.js | 10 +- .../materialParameters/view/CpDialog.vue | 18 +++ 6 files changed, 189 insertions(+), 3 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/MaterialParametersController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/MaterialParametersController.java index cfdb2553..46b679d2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/MaterialParametersController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/MaterialParametersController.java @@ -148,4 +148,11 @@ public class MaterialParametersController { public ResponseEntity getSeries() { return new ResponseEntity<>(materialParametersService.getSeries(), HttpStatus.OK); } + + @PostMapping("/sync") + @Log("同步") + @ApiOperation("同步-产品系列") + public ResponseEntity sync(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(materialParametersService.sync(whereJson),HttpStatus.OK); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/MaterialParametersService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/MaterialParametersService.java index 039c2ae4..df7e4ab4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/MaterialParametersService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/MaterialParametersService.java @@ -85,4 +85,10 @@ public interface MaterialParametersService { * 查询基础分类-产品系列 */ JSONArray getSeries(); + + /** + * 同步 + * @param whereJson / + */ + JSONObject sync(JSONObject whereJson); } 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 2adf3a68..c8b53499 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 @@ -5,6 +5,7 @@ package org.nl.wms.basedata.master.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; @@ -20,6 +21,7 @@ import org.nl.wms.basedata.master.service.MaterialParametersService; import org.nl.wms.basedata.master.service.MaterialbaseService; import org.nl.wms.basedata.master.service.dto.MaterialParametersDto; import org.nl.wms.basedata.master.service.dto.MaterialbaseDto; +import org.nl.wms.basedata.pdm.service.impl.WastecchangeServiceImpl; import org.nl.wql.WQL; import org.nl.wql.core.bean.WQLObject; import org.nl.wql.util.WqlUtil; @@ -318,4 +320,149 @@ public class MaterialParametersServiceImpl implements MaterialParametersService return resultJSONArray; } + @Override + @Transactional(rollbackFor = Exception.class) + public JSONObject sync(JSONObject whereJson) { + /* + * 1.PG粉碳平衡修正 + * 2.软废碳平衡修正 + */ + WQLObject productMstTab = WQLObject.getWQLObject("MD_PD_ProductBOM"); // 产品bom单主表 + WQLObject productDtlTab = WQLObject.getWQLObject("MD_PD_ProductBOMDtl"); // 产品bom单明细表 + WQLObject wasTab = WQLObject.getWQLObject("PDM_BI_WasteCChange"); // 软废碳平衡修正表 + WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); // 物料表 + WQLObject extTab = WQLObject.getWQLObject("MD_ME_ProducMaterialExt"); // 成品物料扩展信息表 + + JSONObject result = new JSONObject(); + + // 1.判断此物料是PG粉还是RF + boolean is_pgf = materialbaseService.isAlongMaterType(MaterOptTypeEnum.PGF.getCode(), whereJson.getString("material_id"), null); + boolean is_rf = materialbaseService.isAlongMaterType(MaterOptTypeEnum.RF.getCode(), whereJson.getString("material_id"), null); + + String material_id = whereJson.getString("material_id"); + JSONObject jsonMater = materTab.query("material_id = '" + material_id + "'").uniqueResult(0); + JSONObject jsonExtMater = extTab.query("material_id = '" + material_id + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonExtMater)) throw new BadRequestException("此PGF扩展属性不存在"); + + if (is_pgf) { + /* + * PG粉碳平衡修正： + * 1.查询此PG粉产品bom明细表第一个碳化钨 + * 2.查询此碳化钨 软废碳平衡修正表获得全部软废类型的值 + * 3.查询软废：物料表，软废编码 = PG粉编码 + '-CF' + * 4.依次修改16种软废类型的碳平衡 + * 软废碳平衡=pg粉碳平衡+CF修正值 + */ + + // 1.查询此物料的产品bom明细表中第一个出现的碳化钨 + // 查主表 + JSONObject jsonProductMst = productMstTab.query("material_id = '" + material_id + "' and is_used = '1' and is_delete = '0'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonProductMst)) throw new BadRequestException("此产品没有创建bom单或者已删除、未启用"); + // 查明细 + JSONArray productDtlArr = productDtlTab.query("bom_id = '" + jsonProductMst.getString("bom_id") + "' order by seqno ASC").getResultJSONArray(0); + if (ObjectUtil.isEmpty(productDtlArr)) throw new BadRequestException("此产品bom单暂无明细"); + + // 找出第一个碳化钨 + String thw_material_id = ""; + for (int i = 0; i < productDtlArr.size(); i++) { + JSONObject jsonProductDtl = productDtlArr.getJSONObject(i); + boolean is_thw = materialbaseService.isAlongMaterType(MaterOptTypeEnum.THW.getCode(), jsonProductDtl.getString("material_id"), null); + + if (is_thw) { + thw_material_id = jsonProductDtl.getString("material_id"); + break; + } + } + + // 2.查询此碳化钨 软废碳平衡修正表获得全部软废类型的值 并转化成数组（便于处理数据） + JSONObject jsonThwMater = materTab.query("material_id = '" + thw_material_id + "'").uniqueResult(0); + JSONObject jsonWas = wasTab.query("material_id = '" + thw_material_id + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonWas)) throw new BadRequestException("此碳化钨软废修正数据不存在："+jsonThwMater.getString("material_code")); + + // 将此碳化钨的软废类型转化为数组 + JSONArray wasArr = new WastecchangeServiceImpl().contentShift(jsonWas); + + // 3.查询软废：物料表，软废编码 = PG粉编码 + '-CF' (以软废类型CF为例) + for (int j = 0; j < wasArr.size(); j++) { + JSONObject jsonWasDtl = wasArr.getJSONObject(j); + + String rf_type_code = jsonMater.getString("material_code") +"-"+jsonWasDtl.getString("name"); + JSONObject jsonRfMater = materTab.query("material_code = '" + rf_type_code + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(jsonRfMater)) { + // 4.依次修改16种软废类型的碳平衡: 软废碳平衡=pg粉碳平衡+CF修正值 + JSONObject jsonRfExt = extTab.query("material_id = '" + jsonRfMater.getString("material_id") + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonRfExt)) throw new BadRequestException("此软废扩展信息不存在:"+rf_type_code); + + double rf_c_balance = NumberUtil.add(jsonExtMater.getDoubleValue("c_balance"), jsonWasDtl.getDoubleValue("value")); + jsonRfExt.put("c_balance", String.valueOf(rf_c_balance)); + extTab.update(jsonRfExt); + } + } + result.put("c_balance", ""); + } + + if (is_rf) { + /* + * 软废粉碳平衡修正： + * 1.找PG粉：查物料表： PG粉编码 = 此软废编码去掉最后一个'-'和后面的内容 + * 2.找碳化钨：此PG粉产品BOM明细第一个碳化钨 + * 3.找修正值：废类型为编码最后'-'后的内容 ：如JZ16-P-A2-20-JY ： 软废类型就是 JY + * 查此碳化钨的软废修正表对应的软废类型：软废碳平衡=pg粉碳平衡+此软废修正值 + * 4.最后将计算后的值返回给页面 + */ + + // 1.找PG粉：查物料表： PG粉编码 = 此软废编码去掉最后一个'-'和后面的内容 + String pg_material_code = jsonMater.getString("material_code").substring(0, jsonMater.getString("material_code").lastIndexOf("-")); + JSONObject jsonPgfMater = materTab.query("material_code = '" + pg_material_code + "'").uniqueResult(0); + + // 2.找碳化钨：此PG粉产品BOM明细第一个碳化钨 + // 查主表 + JSONObject jsonProductMst = productMstTab.query("material_id = '" + jsonPgfMater.getString("material_id") + "' and is_used = '1' and is_delete = '0'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonProductMst)) throw new BadRequestException("此产品没有创建bom单或者已删除、未启用"+pg_material_code); + // 查明细 + JSONArray productDtlArr = productDtlTab.query("bom_id = '" + jsonProductMst.getString("bom_id") + "' order by seqno ASC").getResultJSONArray(0); + if (ObjectUtil.isEmpty(productDtlArr)) throw new BadRequestException("此产品bom单暂无明细"+pg_material_code); + + // 找出第一个碳化钨 + String thw_material_id = ""; + for (int i = 0; i < productDtlArr.size(); i++) { + JSONObject jsonProductDtl = productDtlArr.getJSONObject(i); + boolean is_thw = materialbaseService.isAlongMaterType(MaterOptTypeEnum.THW.getCode(), jsonProductDtl.getString("material_id"), null); + + if (is_thw) { + thw_material_id = jsonProductDtl.getString("material_id"); + break; + } + + } + + // 3.找修正值：废类型为编码最后'-'后的内容 + JSONObject jsonThwMater = materTab.query("material_id = '" + thw_material_id + "'").uniqueResult(0); + JSONObject jsonWas = wasTab.query("material_id = '" + thw_material_id + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonWas)) throw new BadRequestException("此碳化钨软废修正数据不存在："+jsonThwMater.getString("material_name")); + + // 将此碳化钨的软废类型转化为数组 + JSONArray wasArr = new WastecchangeServiceImpl().contentShift(jsonWas); + + String rf_type_code = jsonMater.getString("material_code").substring(jsonMater.getString("material_code").lastIndexOf("-")+1,jsonMater.getString("material_code").length()); + double value = 0; + for (int j = 0; j < wasArr.size(); j++) { + JSONObject jsonWasDtl = wasArr.getJSONObject(j); + + if (StrUtil.equals(rf_type_code, jsonWasDtl.getString("name"))) { + value = jsonWasDtl.getDoubleValue("value"); + break; + } + } + + // 软废碳平衡=pg粉碳平衡+此软废修正值 + JSONObject jsonPgfExt = extTab.query("material_id = '" + jsonPgfMater.getString("material_id") + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonPgfExt)) throw new BadRequestException("此PG粉扩展属性不存在："+pg_material_code); + + double c_balance = NumberUtil.add(jsonPgfExt.getDoubleValue("c_balance"), value); + result.put("c_balance", String.valueOf(c_balance)); + } + return result; + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql index 24af805d..ae1e137c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql @@ -197,7 +197,7 @@ mst.is_delete = '0' AND file.is_delete = '0' AND mst.maint_object = '02' - AND mst.invstatus not in ('01') + AND mst.invstatus in ('02','03') OPTION 输入.device_code <> "" (file.device_code like 输入.device_code or @@ -369,7 +369,7 @@ mst.is_delete = '0' AND file.is_delete = '0' AND mst.maint_object = '01' - AND mst.invstatus not in ('01') + AND mst.invstatus in ('02','03') OPTION 输入.device_code <> "" (file.device_code like 输入.device_code or diff --git a/mes/qd/src/api/wms/basedata/master/materialparameters.js b/mes/qd/src/api/wms/basedata/master/materialparameters.js index b1d2186b..dae88d59 100644 --- a/mes/qd/src/api/wms/basedata/master/materialparameters.js +++ b/mes/qd/src/api/wms/basedata/master/materialparameters.js @@ -55,4 +55,12 @@ export function getSeries() { }) } -export default { add, edit, del, save, queryMaterialParam, getUploadTemplate, getSeries } +export function sync(data) { + return request({ + url: 'api/MaterialParameters/sync', + method: 'post', + data + }) +} + +export default { add, edit, del, save, queryMaterialParam, getUploadTemplate, getSeries, sync } diff --git a/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue b/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue index 04e9bb4d..a4a16f4a 100644 --- a/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue +++ b/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue @@ -214,6 +214,7 @@ + 同步 @@ -328,6 +329,7 @@ export default { dialogUpload: false, PicDialog: false, serieseList: [], + sync_flg: false, prules: { is_auto_open: [ { required: true, message: '不能为空', trigger: 'blur' } @@ -471,6 +473,22 @@ export default { }, submitUpload() { const flag = this.$refs.upload.submit() + }, + sync() { + const data = this.formData + this.sync_flg = true + crudMaterialparameters.sync(data).then(res => { + debugger + if (res.c_balance === '') { + this.crud.notify('同步成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + } else { + this.formData.c_balance = res.c_balance + this.crud.notify('同步成功,请确认', CRUD.NOTIFICATION_TYPE.SUCCESS) + } + this.sync_flg = false + }).catch(() => { + this.sync_flg = false + }) } } } From 1346c2ccf058eb2bdd3ab0fbda0ec74526fc3ad4 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Sat, 15 Oct 2022 17:21:16 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java | 2 +- .../sb/upkeep/service/impl/DevicemaintenancemstServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java index 12e12374..5f84af57 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java @@ -128,7 +128,7 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { String classIds = classstandardService.getAllChildIdStr(class_idStr); map.put("classIds", classIds); } - JSONObject json = WQL.getWO("EM_BI_DEVICEREPAIR001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC"); + JSONObject json = WQL.getWO("EM_BI_DEVICEREPAIR001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.invstatus DESC,mst.input_time DESC"); return json; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenancemstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenancemstServiceImpl.java index 0e26f3b6..b20942d8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenancemstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenancemstServiceImpl.java @@ -116,7 +116,7 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ String classIds = classstandardService.getAllChildIdStr(class_idStr); map.put("classIds", classIds); } - JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC"); + JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.invstatus,mst.input_time DESC"); return json; } From 938a3c62d608800c9e7e9ddc75ab5eb2a65c4290 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Sun, 16 Oct 2022 13:23:31 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/basedata/em/equipmentfile/index.vue | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue b/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue index f476514d..6def5985 100644 --- a/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue +++ b/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue @@ -218,7 +218,7 @@ > - - + + - - - - - - - - + + + + + + + + - - + + - - - - - - - - - - - + + + + + + + + + + + From 4946b8903421d14f4a5e360d1050c31232bb9fe5 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Sun, 16 Oct 2022 14:01:48 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/pdm/rest/DailyplanController.java | 4 +- .../nl/wms/pdm/service/DailyplanService.java | 2 +- .../service/impl/DailyplanServiceImpl.java | 16 ++--- .../nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql | 5 +- .../views/wms/pdm/produce/dailyplan/index.vue | 63 ++++++++++++++++--- 5 files changed, 65 insertions(+), 25 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DailyplanController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DailyplanController.java index 41785268..f5f9f13a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DailyplanController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DailyplanController.java @@ -35,9 +35,9 @@ public class DailyplanController { @GetMapping @Log("查询月生产计划") @ApiOperation("查询月生产计划") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ + public ResponseEntity query(@RequestParam Map whereJson){ return new ResponseEntity<>(dailyplanService. - queryAll(whereJson,page),HttpStatus.OK); + queryAll2(whereJson),HttpStatus.OK); } @GetMapping("/queryday") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DailyplanService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DailyplanService.java index 88c76d53..1291c52a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DailyplanService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DailyplanService.java @@ -24,7 +24,7 @@ public interface DailyplanService { * @param page 分页参数 * @return Map */ - Map queryAll(Map whereJson, Pageable page); + Map queryAll2(Map whereJson); /** * 查询数据分页 * @param whereJson 条件 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java index 282432f6..7b186da4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java @@ -54,7 +54,7 @@ public class DailyplanServiceImpl implements DailyplanService { private final WorkOrdereService workOrdereService; @Override - public Map queryAll(Map whereJson, Pageable page) { + public Map queryAll2(Map whereJson) { HashMap map = new HashMap<>(whereJson); String material_code = map.get("material_code"); @@ -62,8 +62,7 @@ public class DailyplanServiceImpl implements DailyplanService { map.put("material_code", "%" + material_code + "%"); } map.put("flag", "1"); - JSONObject jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "pp.planstart_date,pp.plan_code"); - JSONArray json = jret.getJSONArray("content"); + JSONArray json = WQL.getWO("QPDM_PRODUCTDAILYPLAN").addParamMap(map).process().getResultJSONArray(0); JSONArray ja = new JSONArray(); for(int i=0;i jret = new HashMap(); jret.put("content",ja); return jret; } @@ -210,15 +210,7 @@ public class DailyplanServiceImpl implements DailyplanService { map.put("material_code", "%" + material_code + "%"); } map.put("flag", "2"); - JSONArray jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN") - .addParamMap(map).process().getResultJSONArray(0); - if(jret.size()>0){ - JSONObject form = new JSONObject(); - form.put("rows",jret); - form.put("query",whereJson); - this.submit2(form); - } - jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN") + JSONArray jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN") .addParamMap(map).process().getResultJSONArray(0); JSONArray ja = new JSONArray(); 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 6f706aad..c3308ac0 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 @@ -51,7 +51,7 @@ ########################################## IF 输入.flag = "1" - PAGEQUERY + QUERY SELECT pp.*, ext.old_mark, @@ -94,8 +94,9 @@ OPTION 输入.device_id <> "" pp.device_id = 输入.device_id ENDOPTION + order by pp.planstart_date,pp.plan_code ENDSELECT - ENDPAGEQUERY + ENDQUERY ENDIF IF 输入.flag = "2" diff --git a/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue b/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue index 7054b7c3..52434415 100644 --- a/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue @@ -148,7 +148,30 @@ - + + + + - + @@ -186,8 +209,6 @@ - - @@ -223,7 +244,7 @@ export default { url: 'api/dailyplan', idField: 'dailyplan_id', sort: '', - query: { nowstart_date: new Date(),device_id: '', status: '01' }, + query: { nowstart_date: new Date(), device_id: '', status: '01' }, crudMethod: { ...dailyplan }, optShow: { add: true, @@ -320,14 +341,40 @@ export default { } } }, + moveUp(index, item) { + if (index > 0) { + const upDate = this.crud.data[index - 1] + this.crud.data.splice(index - 1, 1) + this.crud.data.splice(index, 0, upDate) + } else { + this.$message.error('已经是第一条，不可上移') + } + }, + moveDown(index, item) { + if ((index + 1) === this.crud.data.length) { + this.$message.error('已经是最后一条，不可下移') + } else { + console.log(index) + const downDate = this.crud.data[index + 1] + this.crud.data.splice(index + 1, 1) + this.crud.data.splice(index, 0, downDate) + } + }, save() { if (this.crud.query.device_id === '' || this.crud.query.device_id === undefined) { this.crud.notify('请先选择关键设备！') return false } - this.form.device_id = this.crud.query.device_id - this.$refs.child.getMsg(this.crud.query.device_id, this.crud.query.nowstart_date, this.crud.query.checked) - this.structshow = true + this.checkrows = this.crud.data + if (this.checkrows.length === 0) { + this.crud.notify('当前页面无可重排数据！') + return false + } + dailyplan.submit2({ query: this.crud.query, rows: this.checkrows }).then(res => { + this.form.device_id = this.crud.query.device_id + this.$refs.child.getMsg(this.crud.query.device_id, this.crud.query.nowstart_date, this.crud.query.checked) + this.structshow = true + }) }, downdtl() { crud.downloadLoading = true From f5da2e204c2d1d896110bdba9fc96e25d2c459b9 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Sun, 16 Oct 2022 20:32:08 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/basedata/em/equipmentfile/index.vue | 4 +- .../wms/sb/repair/devicegridcheck/index.vue | 49 +++++++------- .../wms/sb/repair/devicerepair/index.vue | 51 +++++++------- .../wms/sb/repair/devicerepairpa/index.vue | 53 +++++++-------- .../wms/sb/repair/devicerepairplan/index.vue | 39 ++++++----- .../sb/repair/devicerepairrequest/index.vue | 35 +++++----- .../wms/sb/repair/devicerepairudit/index.vue | 45 ++++++------- .../wms/sb/repair/devicerepaorout/index.vue | 53 +++++++-------- .../views/wms/sb/repair/devicevprs/index.vue | 43 ++++++------ .../wms/sb/run/devicerunrecord/index.vue | 37 +++++----- .../views/wms/sb/run/devicescrap/index.vue | 50 +++++++------- .../wms/sb/stat/devicerepairquery/index.vue | 67 +++++++++---------- .../wms/sb/upkeep/devicemaintenance/index.vue | 45 ++++++------- .../upkeep/devicemaintenanceaudit/index.vue | 35 +++++----- .../sb/upkeep/devicemaintenancegrid/index.vue | 45 ++++++------- .../sb/upkeep/devicemaintenancepa/index.vue | 41 ++++++------ .../upkeep/devicemaintenancepagrid/index.vue | 41 ++++++------ .../sb/upkeep/devicemaintenanceplan/index.vue | 41 ++++++------ 18 files changed, 379 insertions(+), 395 deletions(-) diff --git a/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue b/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue index 6def5985..218419d9 100644 --- a/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue +++ b/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue @@ -231,8 +231,8 @@ /> - - + + diff --git a/mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue b/mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue index 72222bf1..7f1e1a5c 100644 --- a/mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue +++ b/mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue @@ -101,35 +101,34 @@ - - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/mes/qd/src/views/wms/sb/repair/devicerepair/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepair/index.vue index d6ff08d1..bb03097b 100644 --- a/mes/qd/src/views/wms/sb/repair/devicerepair/index.vue +++ b/mes/qd/src/views/wms/sb/repair/devicerepair/index.vue @@ -92,36 +92,35 @@ - - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + +