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-08-21 10:07:19 +08:00
parent 78b0ea63e5
commit 6b054b04c2
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,7 +73,11 @@ 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);
jo.put("day_num",days); if(date2.getTime() >= date.getTime()){
jo.put("day_num",days);
}else{
jo.put("day_num",-days);
}
ja.add(jo); ja.add(jo);
} }
jret.put("content",ja); jret.put("content",ja);
@@ -108,7 +112,11 @@ 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);
jo.put("day_num",days); if(date2.getTime() >= date.getTime()){
jo.put("day_num",days);
}else{
jo.put("day_num",-days);
}
ja.add(jo); ja.add(jo);
} }
return ja; return ja;

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

@@ -179,7 +179,7 @@
<el-table-column prop="product_weight" label="需求重量" :formatter="crud.formatNum3"/> <el-table-column prop="product_weight" label="需求重量" :formatter="crud.formatNum3"/>
<el-table-column prop="fact_weight" label="生产重量" :formatter="crud.formatNum3" width="150" align="center"> <el-table-column prop="fact_weight" label="生产重量" :formatter="crud.formatNum3" width="150" align="center">
<template scope="scope"> <template scope="scope">
<el-input-number size="mini" v-model="scope.row.fact_weight" :precision="3" :controls="false" :min="1" style="width: 120px" /> <el-input-number size="mini" v-model="scope.row.fact_weight" :precision="3" :controls="false" :min="1" style="width: 120px" :disabled="scope.row.is_proc > 0" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="weight_unit_name" label="单位"/> <el-table-column prop="weight_unit_name" label="单位"/>