From a222eb695d6616e6a566ef012451cf0fd1720384 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Wed, 21 Sep 2022 16:02:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DailyplanServiceImpl.java | 22 +++++++++++++++++-- .../wms/pdm/produce/dailyplan/StructIvt4.vue | 10 ++++++--- .../views/wms/pdm/produce/dailyplan/index.vue | 15 +++++++++++-- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java index 165f7be7..282432f6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java @@ -215,6 +215,7 @@ public class DailyplanServiceImpl implements DailyplanService { if(jret.size()>0){ JSONObject form = new JSONObject(); form.put("rows",jret); + form.put("query",whereJson); this.submit2(form); } jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN") @@ -437,12 +438,16 @@ public class DailyplanServiceImpl implements DailyplanService { } String captemplate_id = captemplate.getString("id"); JSONArray ja = form.getJSONArray("rows"); + JSONObject query = form.getJSONObject("query"); + String checked = query.getString("checked"); + if (StrUtil.isEmpty(checked)) { + checked = "false"; + } JSONObject last = MPS_BD_ProductDailyPlan.query("device_id='"+ja.getJSONObject(0).getString("device_id")+"' and status='01'","planstart_date").uniqueResult(0); if(last ==null ){ throw new BadRequestException("日计划表此分组设备的最早一个日计划为空,没有可重排数据！"); } - JSONArray ja_new = new JSONArray(); for (int i = 0; i < ja.size(); i++) { JSONObject jo = ja.getJSONObject(i); @@ -452,8 +457,21 @@ public class DailyplanServiceImpl implements DailyplanService { MPS_BD_ProductDailyPlan.delete(jo); } } + String nowstart_date = last.getString("planstart_date"); Date date = DateUtil.parse(nowstart_date); + if(checked.equals("true")){ + if (StrUtil.isNotEmpty(query.getString("nowstart_date"))) { + String nowstart_date2 = query.getString("nowstart_date").substring(0,10); + Date date2 = DateUtil.parse(nowstart_date2); + //指定日期小于最晚的日计划日期 + if(date2.getTime() >= date.getTime()){ + nowstart_date = nowstart_date2; + date = date2; + } + } + } + //当天产能是否有剩余 double pcsn_num_day = 0; @@ -474,7 +492,7 @@ public class DailyplanServiceImpl implements DailyplanService { int totalproducecapacity_qty = series.getInteger("totalproducecapacity_qty"); //第一条查数据库 if(StrUtil.isNotEmpty(nowstart_date)){ - JSONObject last2 = MPS_BD_ProductDailyPlan.query("device_id='"+jo.getString("device_id")+"'","planstart_date desc,create_time desc").uniqueResult(0); + JSONObject last2 = MPS_BD_ProductDailyPlan.query("device_id='"+jo.getString("device_id")+"' and planstart_date>='"+nowstart_date+"'","planstart_date desc,create_time desc").uniqueResult(0); String standard_mark = jo.getString("standard_mark"); if(last2 != null ){ nowstart_date = last2.getString("planstart_date"); diff --git a/mes/qd/src/views/wms/pdm/produce/dailyplan/StructIvt4.vue b/mes/qd/src/views/wms/pdm/produce/dailyplan/StructIvt4.vue index b217c9e3..d27122ff 100644 --- a/mes/qd/src/views/wms/pdm/produce/dailyplan/StructIvt4.vue +++ b/mes/qd/src/views/wms/pdm/produce/dailyplan/StructIvt4.vue @@ -34,7 +34,6 @@ 关闭 - 保存 @@ -99,7 +98,7 @@ export default { cxjList: [], XLList: [], fullscreenLoading: false, - queryrow: { device_id: '', status: '01' }, + queryrow: { device_id: '', status: '01', nowstart_date: '', checked: '' }, sortable: null, rows: [] } @@ -127,8 +126,10 @@ export default { * 接受父组件传值 * @param msg */ - getMsg(msg) { + getMsg(msg, msg2, msg3) { this.queryrow.device_id = msg + this.queryrow.nowstart_date = msg2 + this.queryrow.checked = msg3 this.queryrow.status = '01' }, queryStruct() { @@ -172,6 +173,9 @@ export default { } }, close() { + this.queryrow.device_id = '' + this.queryrow.nowstart_date = '' + this.queryrow.checked = '' this.tableDtl = [] this.$emit('update:dialogShow', false) this.$emit('StructIvtClosed', this.rows) 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 7982747b..a2a0d628 100644 --- a/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue @@ -99,6 +99,16 @@ :value="item.value" /> + + + + + + 启用 @@ -200,6 +210,7 @@ import workorder from '@/api/wms/pdm/workorder' import crudseriesProcessRoute from '@/api/wms/pdm/seriesProcessRoute' import { download } from '@/api/data' import { downloadFile } from '@/utils' +import Date from '@/utils/datetime' export default { name: 'dailyplan', @@ -212,7 +223,7 @@ export default { url: 'api/dailyplan', idField: 'dailyplan_id', sort: '', - query: { device_id: '' }, + query: { nowstart_date: new Date(),device_id: '' }, crudMethod: { ...dailyplan }, optShow: { add: true, @@ -315,7 +326,7 @@ export default { return false } this.form.device_id = this.crud.query.device_id - this.$refs.child.getMsg(this.crud.query.device_id) + this.$refs.child.getMsg(this.crud.query.device_id, this.crud.query.nowstart_date, this.crud.query.checked) this.structshow = true }, downdtl() {