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

rev：发货单、调拨单excel

Browse Source
This commit is contained in:
liuxy
2023-09-11 17:58:06 +08:00
parent b9779bf6d5
commit 5a6f39997b
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
View File

@@ -1155,6 +1155,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
String col_num = whereJson.getString("layer_num"); // 转库时用 String col_num = whereJson.getString("layer_num"); // 转库时用
JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + box_no + "' AND status < 3").uniqueResult(0); JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + box_no + "' AND status < 3").uniqueResult(0);
if (ObjectUtil.isEmpty(sub_jo)) throw new BadRequestException("子卷包装关系不存在或已出库，请检查！");
String material_code = sub_jo.getString("product_name"); String material_code = sub_jo.getString("product_name");

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

@@ -5015,6 +5015,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
String order_no = ""; String order_no = "";
ArrayList<HashMap<String, Object>> flData = new ArrayList<>(); ArrayList<HashMap<String, Object>> flData = new ArrayList<>();
WriteSheet sheet = EasyExcel.writerSheet().build(); WriteSheet sheet = EasyExcel.writerSheet().build();
double all_real = 0; // 总毛总
for (int i = 0; i < dtlArr.size(); i++) { for (int i = 0; i < dtlArr.size(); i++) {
JSONObject json = dtlArr.getJSONObject(i); JSONObject json = dtlArr.getJSONObject(i);
@@ -5046,8 +5047,10 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).doubleValue()); // 净重 mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).doubleValue()); // 净重
if (ObjectUtil.isNotEmpty(jsonSub.getString("real_weight"))) { if (ObjectUtil.isNotEmpty(jsonSub.getString("real_weight"))) {
mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("real_weight"), 2).doubleValue()); // 毛重 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();
} else { } else {
mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("box_weight"), 2).doubleValue()); // 毛重 mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("box_weight"), 2).doubleValue()); // 毛重
all_real = NumberUtil.add(String.valueOf(all_real), jsonSub.getString("box_weight")).doubleValue();
} }
flData.add(mapFL); flData.add(mapFL);
@@ -5060,6 +5063,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
ExcelWriter workBook = EasyExcel.write(outputStream, null).withTemplate(code_template).build(); ExcelWriter workBook = EasyExcel.write(outputStream, null).withTemplate(code_template).build();
oneMap.put("all_qty", all_qty); // 合计 oneMap.put("all_qty", all_qty); // 合计
oneMap.put("all_real", all_real); // 总毛重
workBook.fill(oneMap, sheet); workBook.fill(oneMap, sheet);
workBook.fill(new FillWrapper("data", flData), sheet); workBook.fill(new FillWrapper("data", flData), sheet);
workBook.finish(); workBook.finish();
@@ -5069,6 +5073,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
Integer integer = Integer.valueOf(String.valueOf(NumberUtil.round(ceil, 0))); Integer integer = Integer.valueOf(String.valueOf(NumberUtil.round(ceil, 0)));
double all_qty = 0; double all_qty = 0;
double all_real = 0;
String order_no = ""; String order_no = "";
ArrayList<HashMap<String, Object>> flData = new ArrayList<>(); ArrayList<HashMap<String, Object>> flData = new ArrayList<>();
for (int i = j * shd_dtl_num; i < (j + 1) * shd_dtl_num; i++) { for (int i = j * shd_dtl_num; i < (j + 1) * shd_dtl_num; i++) {
@@ -5105,18 +5110,22 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).doubleValue()); mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).doubleValue());
if (ObjectUtil.isNotEmpty(jsonSub.getString("real_weight"))) { if (ObjectUtil.isNotEmpty(jsonSub.getString("real_weight"))) {
mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("real_weight"), 2).doubleValue()); // 毛重 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();
} else { } else {
mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("box_weight"), 2).doubleValue()); // 毛重 mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("box_weight"), 2).doubleValue()); // 毛重
all_real = NumberUtil.add(String.valueOf(all_real), jsonSub.getString("box_weight")).doubleValue();
} }
flData.add(mapFL); flData.add(mapFL);
// 计算合计重量 // 计算合计重量
all_qty = NumberUtil.add(String.valueOf(all_qty), json.getString("qty")).doubleValue(); 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();
} }
// 订单号 // 订单号
ExcelWriter workBook = EasyExcel.write(outputStream, null).withTemplate(code_template).build(); ExcelWriter workBook = EasyExcel.write(outputStream, null).withTemplate(code_template).build();
oneMap.put("all_qty", all_qty); // 合计 oneMap.put("all_qty", all_qty); // 合计
oneMap.put("all_real", all_real); // 总毛重
WriteSheet sheet = EasyExcel.writerSheet(0).build(); WriteSheet sheet = EasyExcel.writerSheet(0).build();
workBook.fill(oneMap, sheet); workBook.fill(oneMap, sheet);
workBook.fill(new FillWrapper("data", flData), sheet); workBook.fill(new FillWrapper("data", flData), sheet);