diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java index c11fa5279..a387c0f69 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java @@ -1155,6 +1155,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { 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); + if (ObjectUtil.isEmpty(sub_jo)) throw new BadRequestException("子卷包装关系不存在或已出库,请检查!"); String material_code = sub_jo.getString("product_name"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 9314e6035..858ef445d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -5015,6 +5015,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { String order_no = ""; ArrayList> flData = new ArrayList<>(); WriteSheet sheet = EasyExcel.writerSheet().build(); + double all_real = 0; // 总毛总 for (int i = 0; i < dtlArr.size(); 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()); // 净重 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(); } else { 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); @@ -5060,6 +5063,7 @@ 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); // 总毛重 workBook.fill(oneMap, sheet); workBook.fill(new FillWrapper("data", flData), sheet); workBook.finish(); @@ -5069,6 +5073,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { Integer integer = Integer.valueOf(String.valueOf(NumberUtil.round(ceil, 0))); double all_qty = 0; + double all_real = 0; String order_no = ""; ArrayList> flData = new ArrayList<>(); 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()); 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(); } else { 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); // 计算合计重量 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(); oneMap.put("all_qty", all_qty); // 合计 + oneMap.put("all_real", all_real); // 总毛重 WriteSheet sheet = EasyExcel.writerSheet(0).build(); workBook.fill(oneMap, sheet); workBook.fill(new FillWrapper("data", flData), sheet);