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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-11-25 18:41:16 +08:00
parent e69be1bc25
commit 7aa3933a36
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2172,6 +2172,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
int shd_dtl_num = jsonCust.getIntValue("shd_dtl_num"); // 送货单明细数
if (shd_dtl_num > dtlArr.size()) {
double all_qty = 0;
ArrayList<HashMap<String, Object>> flData = new ArrayList<>();
WriteSheet sheet = EasyExcel.writerSheet().build();
for (int i = 0; i < dtlArr.size(); i++) {
@@ -2196,9 +2197,11 @@ 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).toString());
mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).doubleValue());
flData.add(mapFL);
all_qty = NumberUtil.add(String.valueOf(all_qty), json.getString("qty")).doubleValue();
}
oneMap.put("all_qty",all_qty);
workBook.fill(oneMap, sheet);
workBook.fill(new FillWrapper("data", flData), sheet);
workBook.finish();
@@ -2207,6 +2210,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
double ceil = Math.ceil(div);
Integer integer = Integer.valueOf(String.valueOf(NumberUtil.round(ceil, 0)));
double all_qty = 0;
ArrayList<HashMap<String, Object>> flData = new ArrayList<>();
for (int i = j * shd_dtl_num; i < (j + 1) * shd_dtl_num; i++) {
if (i == dtlArr.size()) {
@@ -2234,10 +2238,14 @@ 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).toString());
mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).doubleValue());
flData.add(mapFL);
// 计算合计重量
all_qty = NumberUtil.add(String.valueOf(all_qty), json.getString("qty")).doubleValue();
}
oneMap.put("all_qty",all_qty);
WriteSheet sheet = EasyExcel.writerSheet(0).build();
workBook.fill(oneMap, sheet);
workBook.fill(new FillWrapper("data", flData), sheet);