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 7a307a4e..25a46307 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 @@ -73,10 +73,12 @@ public class DailyplanServiceImpl implements DailyplanService { String plan_finish_date = jo.getString("plan_finish_date"); Date date2 = DateUtil.parse(plan_finish_date); long days = (int) DateUtil.between(date2,date, DateUnit.DAY); + int report_time = jo.getInteger("report_time"); + int report_day = report_time/24; if(date2.getTime() >= date.getTime()){ - jo.put("day_num",days); + jo.put("day_num",days-report_day); }else{ - jo.put("day_num",-days); + jo.put("day_num",-days-report_day); } ja.add(jo); } 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 cb529dd4..e4bf151d 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 @@ -56,6 +56,7 @@ ext.standard_mark, ext.product_series AS mater_product_series, ext.standard_weight_pft AS standard_weight, + ext.report_time, materialbase.material_code, deviceinfo.device_code, deviceinfo.device_name, 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 74b072d2..b9c4ddaf 100644 --- a/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue @@ -218,7 +218,7 @@ export default { optShow: { add: true, edit: false, - del: false, + del: true, download: false, reset: false }})