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 ea140425..165f7be7 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 @@ -102,7 +102,7 @@ public class DailyplanServiceImpl implements DailyplanService { map.put("end_time", end_time.substring(0,10)+" 23:59:59"); } map.put("flag", "3"); - JSONObject jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "WorkOrder.planstart_time,WorkOrder.device_id,ext.old_mark"); + JSONObject jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "WorkOrder2.planstart_time,WorkOrder2.device_id,WorkOrder2.old_mark"); JSONArray json = jret.getJSONArray("content"); JSONArray ja = new JSONArray(); for(int i=0;i "" - WorkOrder.planstart_time >= 输入.begin_time - ENDOPTION - OPTION 输入.end_time <> "" - WorkOrder.planstart_time <= 输入.end_time - ENDOPTION - OPTION 输入.material_code <> "" - (materialbase.material_code like 输入.material_code or materialbase.material_name like 输入.material_code) - ENDOPTION - OPTION 输入.device_id <> "" - WorkOrder.device_id = 输入.device_id - ENDOPTION - group by WorkOrder.planstart_time,WorkOrder.device_id,ext.old_mark + ( + SELECT + WorkOrder.planstart_time, + WorkOrder.workorder_qty, + deviceinfo.device_code AS device_code2, + deviceinfo.device_name AS device_name2, + WorkOrder.device_id, + ext.old_mark + FROM + PDM_BI_WorkOrder WorkOrder + LEFT JOIN MD_ME_ProducMaterialExt ext ON WorkOrder.material_id = ext.material_id + LEFT JOIN md_me_materialbase materialbase ON WorkOrder.material_id = materialbase.material_id + LEFT JOIN em_bi_deviceinfo deviceinfo ON deviceinfo.device_id = WorkOrder.device_id + WHERE + 1=1 and WorkOrder.is_delete='0' + AND deviceinfo.is_active = '1' + AND deviceinfo.is_delete = '0' + AND deviceinfo.is_produceuse = '1' + AND deviceinfo.workprocedure_code = 'GX003' + OPTION 输入.begin_time <> "" + WorkOrder.planstart_time >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + WorkOrder.planstart_time <= 输入.end_time + ENDOPTION + OPTION 输入.material_code <> "" + (materialbase.material_code like 输入.material_code or materialbase.material_name like 输入.material_code) + ENDOPTION + OPTION 输入.device_id <> "" + WorkOrder.device_id = 输入.device_id + ENDOPTION + ) WorkOrder2 + group by WorkOrder2.planstart_time,WorkOrder2.device_id,WorkOrder2.old_mark ENDSELECT ENDPAGEQUERY ENDIF @@ -269,14 +278,23 @@ IF 输入.flag = "7" PAGEQUERY - SELECT - deviceinfo.device_code, - deviceinfo.device_name, - WorkOrder.device_id, + SELECT + WorkOrder2.material_code, + WorkOrder2.device_id, COUNT(*) AS product_num, - sum(WorkOrder.workorder_qty) AS sum_qty, + sum( WorkOrder2.workorder_qty ) AS sum_qty, + MIN(WorkOrder2.device_code2)AS device_code, + MIN(WorkOrder2.device_name2) AS device_name, + MIN(WorkOrder2.planstart_time) AS workorder_date + FROM + ( + SELECT + deviceinfo.device_code AS device_code2, + deviceinfo.device_name AS device_name2, + WorkOrder.device_id, + WorkOrder.workorder_qty, materialbase.material_code, - MIN(WorkOrder.planstart_time) AS workorder_date + WorkOrder.planstart_time FROM PDM_BI_WorkOrder WorkOrder LEFT JOIN md_me_materialbase materialbase ON WorkOrder.material_id = materialbase.material_id @@ -292,7 +310,8 @@ OPTION 输入.material_code <> "" (materialbase.material_code like 输入.material_code or materialbase.material_name like 输入.material_code) ENDOPTION - group by WorkOrder.device_id,materialbase.material_code + ) WorkOrder2 + group by WorkOrder2.device_id,WorkOrder2.material_code ENDSELECT ENDPAGEQUERY ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/rest/DevicerepairmstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/rest/DevicerepairmstController.java index 14e8b3e5..bb846d16 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/rest/DevicerepairmstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/rest/DevicerepairmstController.java @@ -74,6 +74,14 @@ public class DevicerepairmstController { return new ResponseEntity<>(devicerepairmstService.queryBom(whereJson, page), HttpStatus.OK); } + @GetMapping("/findByCode") + @Log("查询备件bom") + @ApiOperation("查询") + public ResponseEntity findByCode(@RequestParam Map whereJson) { + String code = (String) whereJson.get("id"); + return new ResponseEntity<>(devicerepairmstService.findByCode(code), HttpStatus.OK); + } + @PostMapping @Log("新增维修单维护") @ApiOperation("新增维修单维护") 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 58199a40..2cfc0a60 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 @@ -149,7 +149,7 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { @Override public DevicerepairmstDto findByCode(String code) { WQLObject wo = WQLObject.getWQLObject("em_bi_devicerepairmst"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); + JSONObject json = wo.query("repair_code ='" + code + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(json)) { return json.toJavaObject(DevicerepairmstDto.class); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/rest/DevicemaintenancemstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/rest/DevicemaintenancemstController.java index 1d86afee..78f276d2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/rest/DevicemaintenancemstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/rest/DevicemaintenancemstController.java @@ -68,6 +68,14 @@ public class DevicemaintenancemstController { return new ResponseEntity<>(HttpStatus.CREATED); } + @GetMapping("/findByCode") + @Log("查询备件bom") + @ApiOperation("查询") + public ResponseEntity findByCode(@RequestParam Map whereJson) { + String code = (String) whereJson.get("id"); + return new ResponseEntity<>(devicemaintenancemstService.findByCode(code), HttpStatus.OK); + } + @PutMapping @Log("修改设备保养单") @ApiOperation("修改设备保养单") 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 b7e5ce43..729058b8 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 @@ -141,7 +141,7 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ @Override public DevicemaintenancemstDto findByCode(String code) { WQLObject wo = WQLObject.getWQLObject("em_bi_devicemaintenancemst"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); + JSONObject json = wo.query("maint_code ='" + code + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(json)) { return json.toJavaObject(DevicemaintenancemstDto.class); } diff --git a/mes/qd/src/api/wms/sb/devicemaintenancemst.js b/mes/qd/src/api/wms/sb/devicemaintenancemst.js index df1bd9aa..ca2e96e9 100644 --- a/mes/qd/src/api/wms/sb/devicemaintenancemst.js +++ b/mes/qd/src/api/wms/sb/devicemaintenancemst.js @@ -16,6 +16,14 @@ export function del(ids) { }) } +export function findByCode(params) { + return request({ + url: 'api/devicemaintenancemst/findByCode', + method: 'get', + params + }) +} + export function edit(data) { return request({ url: 'api/devicemaintenancemst', @@ -80,4 +88,4 @@ export function auditMaintain(data) { }) } -export default { add, edit, del, getDtl, putIn, startMaintain, endMaintain, submitMain, confirmMaintain, auditMaintain } +export default { findByCode, add, edit, del, getDtl, putIn, startMaintain, endMaintain, submitMain, confirmMaintain, auditMaintain } diff --git a/mes/qd/src/api/wms/sb/devicerepairmst.js b/mes/qd/src/api/wms/sb/devicerepairmst.js index b7050f2f..bc610c35 100644 --- a/mes/qd/src/api/wms/sb/devicerepairmst.js +++ b/mes/qd/src/api/wms/sb/devicerepairmst.js @@ -32,6 +32,14 @@ export function getDtl(data) { }) } +export function findByCode(params) { + return request({ + url: 'api/devicerepairmst/findByCode', + method: 'get', + params + }) +} + export function submit(data) { return request({ url: 'api/devicerepairmst/submit', @@ -136,4 +144,4 @@ export function submitReceive(data) { }) } -export default { add, edit, del, getDtl, submit, startRepair, endRepair, submitRepair, confirmRepair, submitResuft, getResult, outRepair, checkRepair, uditRepair, getNormBom, getFileBom, submitReceive } +export default { findByCode, add, edit, del, getDtl, submit, startRepair, endRepair, submitRepair, confirmRepair, submitResuft, getResult, outRepair, checkRepair, uditRepair, getNormBom, getFileBom, submitReceive } diff --git a/mes/qd/src/views/wms/basedata/em/equipmentfile/ChangeDialog.vue b/mes/qd/src/views/wms/basedata/em/equipmentfile/ChangeDialog.vue index ff8dce3d..5c80166d 100644 --- a/mes/qd/src/views/wms/basedata/em/equipmentfile/ChangeDialog.vue +++ b/mes/qd/src/views/wms/basedata/em/equipmentfile/ChangeDialog.vue @@ -92,7 +92,11 @@ - + + + @@ -128,6 +132,8 @@ 上传到服务器 + + @@ -136,13 +142,17 @@ import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure' import localStorage from '@/api/tools/localStorage' import equipmentfile from '@/api/wms/basedata/em/equipmentfile' +import ViewDialog1 from '@/views/wms/basedata/em/equipmentfile/ViewDialog1' +import ViewDialog2 from '@/views/wms/basedata/em/equipmentfile/ViewDialog2' import { getToken } from '@/utils/auth' import { mapGetters } from 'vuex' import CRUD, { crud } from '@crud/crud' +import crudDevicerepairmst from '@/api/wms/sb/devicerepairmst' +import crudDevicemaintenancemst from '@/api/wms/sb/devicemaintenancemst' export default { name: 'ChangeDialog', - components: { }, + components: { ViewDialog1, ViewDialog2 }, mixins: [crud()], props: { dialogShow: { @@ -163,6 +173,9 @@ export default { tableDtl: [], tableDtl2: [], tableDtl3: [], + mstrow: {}, + viewShow1: false, + viewShow2: false, form: {} } }, @@ -222,7 +235,6 @@ export default { }) }, submitUpload() { - debugger const flag = this.$refs.upload.submit() }, beforeUpload(file) { @@ -245,6 +257,29 @@ export default { submitUpload2() { this.dialogVisible2 = true }, + toView(row) { + debugger + if (row.invcode.includes('WXD')) { + const data = { + 'id': row.invcode + } + crudDevicerepairmst.findByCode(data).then(res => { + this.mstrow = res + this.mstrow.device_code = this.form.device_code + this.viewShow1 = true + }) + }else{ + const data = { + 'id': row.invcode + } + crudDevicemaintenancemst.findByCode(data).then(res => { + this.mstrow = res + this.mstrow.device_code = this.form.device_code + this.viewShow2 = true + }) + } + + }, deleteRow(index, row) { localStorage.del([row.storage_id]) equipmentfile.queryivt3(this.form).then(res => { diff --git a/mes/qd/src/views/wms/basedata/em/equipmentfile/ViewDialog1.vue b/mes/qd/src/views/wms/basedata/em/equipmentfile/ViewDialog1.vue new file mode 100644 index 00000000..097a347e --- /dev/null +++ b/mes/qd/src/views/wms/basedata/em/equipmentfile/ViewDialog1.vue @@ -0,0 +1,187 @@ + + + + + diff --git a/mes/qd/src/views/wms/basedata/em/equipmentfile/ViewDialog2.vue b/mes/qd/src/views/wms/basedata/em/equipmentfile/ViewDialog2.vue new file mode 100644 index 00000000..43421bfc --- /dev/null +++ b/mes/qd/src/views/wms/basedata/em/equipmentfile/ViewDialog2.vue @@ -0,0 +1,173 @@ + + + + + diff --git a/mes/qd/src/views/wms/statistics/productmouth/index.vue b/mes/qd/src/views/wms/statistics/productmouth/index.vue index 298e23aa..9cee663e 100644 --- a/mes/qd/src/views/wms/statistics/productmouth/index.vue +++ b/mes/qd/src/views/wms/statistics/productmouth/index.vue @@ -48,9 +48,9 @@ - - - + + + diff --git a/mes/qd/src/views/wms/statistics/producttask/index.vue b/mes/qd/src/views/wms/statistics/producttask/index.vue index a10ae71d..754cdab8 100644 --- a/mes/qd/src/views/wms/statistics/producttask/index.vue +++ b/mes/qd/src/views/wms/statistics/producttask/index.vue @@ -133,8 +133,8 @@ - +