diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/controller/ContractFileController.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/controller/ContractFileController.java index d69f0788..5eac9eee 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/controller/ContractFileController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/controller/ContractFileController.java @@ -263,20 +263,20 @@ public class ContractFileController { File temporary = new File(XSSEscape.escapePath(filePath + fileName)); //得到数据 List personList = ExcelUtil.importExcel(temporary, 0, 1, ContractFileModel.class); - for (ContractFileModel model : personList) { - if (model.getNum()==null||model.getNum().equals(" ")||model.getNum().equals(null)){ - return ActionResult.fail("合同导入数量是必填项,可默认填写为0"); - } - if (model.getAmount()==null||model.getAmount().equals(" ")||model.getAmount().equals(null)){ - return ActionResult.fail("合同导入金额是必填项,可默认填写为0"); - } - if (model.getName()==null||model.getName().equals(" ")||model.getName().equals(null)){ - return ActionResult.fail("合同导入供应商是必填项"); - } - if (model.getContractNo()==null||model.getContractNo().equals(" ")||model.getContractNo().equals(null)){ - return ActionResult.fail("合同导入对方合同号是必填项"); - } - } +// for (ContractFileModel model : personList) { +// if (model.getNum()==null||model.getNum().equals(" ")||model.getNum().equals(null)){ +// return ActionResult.fail("合同导入数量是必填项,可默认填写为0"); +// } +// if (model.getAmount()==null||model.getAmount().equals(" ")||model.getAmount().equals(null)){ +// return ActionResult.fail("合同导入金额是必填项,可默认填写为0"); +// } +// if (model.getName()==null||model.getName().equals(" ")||model.getName().equals(null)){ +// return ActionResult.fail("合同导入供应商是必填项"); +// } +// if (model.getContractNo()==null||model.getContractNo().equals(" ")||model.getContractNo().equals(null)){ +// return ActionResult.fail("合同导入对方合同号是必填项"); +// } +// } //预览数据 Map map = contractFileService.importPreview(personList); return ActionResult.success(map); diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml index 1115689a..0eb7db22 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml @@ -10,10 +10,10 @@ d.document_no sourceOrderNo FROM jg_arinvoices a - LEFT JOIN jg_customer b ON a.customer_id = b.id and b.delete_mark = '0' - LEFT JOIN jg_contract c ON a.contract_id = c.id and c.delete_mark = '0' - LEFT JOIN jg_salesorder d ON a.sales_order_id = d.id and d.delete_mark = '0' - ${ew.customSqlSegment} + LEFT JOIN jg_customer b ON a.customer_id = b.id + LEFT JOIN jg_contract c ON a.contract_id = c.id + LEFT JOIN jg_salesorder d ON a.sales_order_id = d.id + ${ew.customSqlSegment} and a.delete_mark = '0' and b.delete_mark = '0' and c.delete_mark = '0' and d.delete_mark = '0' and a.document_no LIKE CONCAT('%',#{arinvoicesPagination.documentNo},'%') diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml index 000b3086..6f51a906 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml @@ -15,9 +15,9 @@ c.contract_name contractNm FROM jg_collection a - LEFT JOIN jg_customer b ON a.customer_id = b.id and b.delete_mark = '0' - LEFT JOIN jg_contract c ON a.contract_id = c.id and c.delete_mark = '0' - ${ew.customSqlSegment} + LEFT JOIN jg_customer b ON a.customer_id = b.id + LEFT JOIN jg_contract c ON a.contract_id = c.id + ${ew.customSqlSegment} and b.delete_mark = '0' and c.delete_mark = '0' and a.document_no LIKE CONCAT('%',#{collectionPagination.documentNo},'%') diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/contract/ContractFileMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/contract/ContractFileMapper.xml index ec708250..205cf968 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/contract/ContractFileMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/contract/ContractFileMapper.xml @@ -9,11 +9,10 @@ FROM jg_contract a LEFT JOIN jg_poundlist b ON b.purchase_id = a.id - AND (b.purchase_status != 99 OR ISNULL( b.purchase_status )) - AND (b.purchase_status != 0 OR ISNULL( b.purchase_status )) - AND b.pound_status = '0' - AND b.delete_mark = '0' - ${ew.customSqlSegment} + ${ew.customSqlSegment} AND (b.purchase_status != 99 OR ISNULL( b.purchase_status )) + AND (b.purchase_status != 0 OR ISNULL( b.purchase_status )) + AND b.pound_status = '0' + AND b.delete_mark = '0' and a.contract_code LIKE CONCAT('%',#{contractFilePagination.contractCode},'%') @@ -37,11 +36,8 @@ FROM jg_contract a LEFT JOIN jg_poundlist b ON b.sales_id = a.id - AND (b.sales_status != 99 OR ISNULL( b.sales_status )) - AND (b.sales_status != 0 OR ISNULL( b.sales_status )) - AND b.pound_status = '0' - AND b.delete_mark = '0' - ${ew.customSqlSegment} + ${ew.customSqlSegment} AND (b.sales_status != 99 OR ISNULL( b.sales_status )) AND (b.sales_status != 0 OR ISNULL( b.sales_status )) + AND b.pound_status = '0' AND b.delete_mark = '0' and a.contract_code LIKE CONCAT('%',#{contractFilePagination.contractCode},'%')