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

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2024-01-16 17:17:46 +08:00
parent 924f83f0ce 3da40b153d
commit 1e7de370dc
1840 changed files with 186796 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -5285,12 +5285,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
mapFL.put("material_spec", material_spec);
// mapFL.put("qty_unit_name", "KG");
mapFL.put("box_no", sub_box_no);
mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).doubleValue()); // 净重
mapFL.put("qty", NumberUtil.round(json.getString("qty"), 1).doubleValue()); // 净重
if (ObjectUtil.isNotEmpty(jsonSub.getString("real_weight"))) {
mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("real_weight"), 2).doubleValue()); // 毛重
all_real = NumberUtil.add(String.valueOf(all_real), jsonSub.getString("real_weight")).doubleValue();
mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("box_weight"), 1).doubleValue()); // 毛重
all_real = NumberUtil.add(String.valueOf(all_real), jsonSub.getString("box_weight")).doubleValue();
} else {
mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("box_weight"), 2).doubleValue()); // 毛重
mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("box_weight"), 1).doubleValue()); // 毛重
all_real = NumberUtil.add(String.valueOf(all_real), jsonSub.getString("box_weight")).doubleValue();
}
@@ -5303,8 +5303,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
}*/
ExcelWriter workBook = EasyExcel.write(outputStream, null).withTemplate(code_template).build();
oneMap.put("all_qty", all_qty); // 合计
oneMap.put("all_real", all_real); // 总毛重
oneMap.put("all_qty", NumberUtil.round(all_qty, 1)); // 合计
oneMap.put("all_real", NumberUtil.round(all_real,1)); // 总毛重
workBook.fill(oneMap, sheet);
workBook.fill(new FillWrapper("data", flData), sheet);
workBook.finish();
@@ -5351,25 +5351,25 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
mapFL.put("material_spec", material_spec);
// mapFL.put("qty_unit_name", "KG");
mapFL.put("box_no", sub_box_no);
mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).doubleValue());
mapFL.put("qty", NumberUtil.round(json.getString("qty"), 1).doubleValue());
if (ObjectUtil.isNotEmpty(jsonSub.getString("real_weight"))) {
mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("real_weight"), 2).doubleValue()); // 毛重
all_real = NumberUtil.add(String.valueOf(all_real), jsonSub.getString("real_weight")).doubleValue();
mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("box_weight"), 1).doubleValue()); // 毛重
all_real = NumberUtil.add(String.valueOf(all_real), jsonSub.getString("box_weight")).doubleValue();
} else {
mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("box_weight"), 2).doubleValue()); // 毛重
mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("box_weight"), 1).doubleValue()); // 毛重
all_real = NumberUtil.add(String.valueOf(all_real), jsonSub.getString("box_weight")).doubleValue();
}
flData.add(mapFL);
// 计算合计重量
all_qty = NumberUtil.add(String.valueOf(all_qty), json.getString("qty")).doubleValue();
all_real = NumberUtil.add(String.valueOf(all_real), jsonSub.getString("real_weight")).doubleValue();
all_real = NumberUtil.add(String.valueOf(all_real), jsonSub.getString("box_weight")).doubleValue();
}
// 订单号
ExcelWriter workBook = EasyExcel.write(outputStream, null).withTemplate(code_template).build();
oneMap.put("all_qty", all_qty); // 合计
oneMap.put("all_real", all_real); // 总毛重
oneMap.put("all_qty", NumberUtil.round(all_qty, 1)); // 合计
oneMap.put("all_real", NumberUtil.round(all_real,1)); // 总毛重
WriteSheet sheet = EasyExcel.writerSheet(0).build();
workBook.fill(oneMap, sheet);
workBook.fill(new FillWrapper("data", flData), sheet);

2
lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
View File

@@ -487,6 +487,7 @@
:min-width="flexWidth('box_weight',crud.data,'木箱自身重量')"
:formatter="crud.formatNum3"
/>
<el-table-column prop="real_weight" label="实际重量"/>
<el-table-column
prop="quality_guaran_period"
label="保质期"
@@ -520,7 +521,6 @@
<el-table-column prop="box_length" label="长" :min-width="flexWidth('box_length',crud.data,'长')" />
<el-table-column prop="box_width" label="宽" :min-width="flexWidth('box_width',crud.data,'宽')" />
<el-table-column prop="box_high" label="高" :min-width="flexWidth('box_high',crud.data,'高')" />
<el-table-column prop="real_weight" label="实际重量"/>
<el-table-column prop="demand_limit" label="客户需求抗拉下限" :min-width="flexWidth('demand_limit',crud.data,'客户需求抗拉下限')" />
<el-table-column prop="standard_limit" label="内控标准抗拉下限" :min-width="flexWidth('standard_limit',crud.data,'内控标准抗拉下限')" />
<el-table-column prop="actual_value" label="生产实际抗拉值" :min-width="flexWidth('actual_value',crud.data,'生产实际抗拉值')" />