root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zds
2022-09-05 17:21:24 +08:00
parent 2f89c02575
commit 3d6c00386e
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java
View File

@@ -73,10 +73,12 @@ public class DailyplanServiceImpl implements DailyplanService {
String plan_finish_date = jo.getString("plan_finish_date"); String plan_finish_date = jo.getString("plan_finish_date");
Date date2 = DateUtil.parse(plan_finish_date); Date date2 = DateUtil.parse(plan_finish_date);
long days = (int) DateUtil.between(date2,date, DateUnit.DAY); 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()){ if(date2.getTime() >= date.getTime()){
jo.put("day_num",days); jo.put("day_num",days-report_day);
}else{ }else{
jo.put("day_num",-days); jo.put("day_num",-days-report_day);
} }
ja.add(jo); ja.add(jo);
} }

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql
View File

@@ -56,6 +56,7 @@
ext.standard_mark, ext.standard_mark,
ext.product_series AS mater_product_series, ext.product_series AS mater_product_series,
ext.standard_weight_pft AS standard_weight, ext.standard_weight_pft AS standard_weight,
ext.report_time,
materialbase.material_code, materialbase.material_code,
deviceinfo.device_code, deviceinfo.device_code,
deviceinfo.device_name, deviceinfo.device_name,

2
mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue
View File

@@ -218,7 +218,7 @@ export default {
optShow: { optShow: {
add: true, add: true,
edit: false, edit: false,
del: false, del: true,
download: false, download: false,
reset: false reset: false
}}) }})