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 10f5ac0e7..7eedeab18 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 @@ -6014,13 +6014,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } @Override - @Transactional(rollbackFor = Exception.class) public void downloadExcel(HttpServletResponse response, Map whereJson) throws IOException { WQLObject custTab = WQLObject.getWQLObject("MD_CS_CustomerBase"); // 客户基本信息表 WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_IOStorInv"); // 出入库主表 WQLObject dtlTab = WQLObject.getWQLObject("st_ivt_iostorinvdtl"); // 出入库明细表 - WQLObject disTab = WQLObject.getWQLObject("st_ivt_iostorinvdis"); // 出入库分配明细 WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); // 子卷包装关系表 WQLObject tranTab = WQLObject.getWQLObject("MD_CS_TransportationBase"); // 物流公司表 WQLObject storTab = WQLObject.getWQLObject("st_ivt_bsrealstorattr"); // 实物仓库表 @@ -6096,8 +6094,15 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } else { shd_dtl_num = jsonCust.getIntValue("shd_dtl_num"); + if (ObjectUtil.isEmpty(shd_dtl_num)) { + throw new BadRequestException("客户编码:"+cust_code+",送货单明细数未配置,请先去配置!"); + } //1.根据出入库主表中 收货单位 查询客户表中的模板路径 code_template = jsonCust.getString("shd_print_no"); + + if (StrUtil.isEmpty(code_template)) { + throw new BadRequestException("客户编码:"+cust_code+",送货单打印模板号未配置,请先去配置!"); + } } JSONObject jsonDtl = dtlTab.query("iostorinv_id = '" + jsonMst.getString("iostorinv_id") + "'").uniqueResult(0);