Merge remote-tracking branch 'origin/dev' into test

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java

@@ -26,7 +26,9 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
+import static com.zt.plat.framework.common.pojo.CommonResult.error;
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
+import static com.zt.plat.module.contractorder.enums.ErrorCodeConstants.CONTRACT_SUBMIT_ERP_FAIL;
 
 @Slf4j
 @Tag(name = "管理后台 - 合同管理")
@@ -153,10 +155,8 @@ public class ContractController implements BusinessControllerMarker {
     @Operation(summary = "提交ERP")
     @PreAuthorize("@ss.hasPermission('base:contract:erp')")
     public CommonResult<JSONObject> submitErp(@RequestParam("id") Long id) {
-//        JSONObject res = contractService.submitErp(id);
+        JSONObject res = contractService.submitErp(id);
-//        return res.getBool("success") ? success(res) : error(CONTRACT_SUBMIT_ERP_FAIL.getCode(), res.getStr("data"));
+        return res.getBool("success") ? success(res) : error(CONTRACT_SUBMIT_ERP_FAIL.getCode(), res.getStr("data"));
-        // TODO ERP默认返回成功处理 SZHGYL-251
-        return success(new JSONObject().putOnce("success", true));
     }
 
     @GetMapping("/list/up-not-relation")

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java

@@ -1193,6 +1193,11 @@ public class ContractServiceImpl implements ContractService {
             contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber());
         }
 
+        // 未查询到相关合同
+        if (CollectionUtils.isEmpty(contractIds)) {
+            return new PageResult<>();
+        }
+
         // 分页查询
         IPage<NotRespVO> ipage = contractNotMapper.selectNots(
                 new Page<NotRespVO>().setCurrent(queryReqVO.getPageNo()).setSize(queryReqVO.getPageSize()),
@@ -1215,6 +1220,11 @@ public class ContractServiceImpl implements ContractService {
             contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber());
         }
 
+        // 未查询到相关合同
+        if (CollectionUtils.isEmpty(contractIds)) {
+            return new PageResult<>();
+        }
+
         // 分页查询
         IPage<DemoteRespVO> ipage = contractDemoteMapper.selectDemotes(
                 new Page<>().setCurrent(queryReqVO.getPageNo()).setSize(queryReqVO.getPageSize()),
@@ -1237,6 +1247,11 @@ public class ContractServiceImpl implements ContractService {
             contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber());
         }
 
+        // 未查询到相关合同
+        if (CollectionUtils.isEmpty(contractIds)) {
+            return new PageResult<>();
+        }
+
         // 分页查询
         IPage<FormulaRespVO> ipage = contractFormulaMapper.selectFormulas(
                 new Page<>().setCurrent(queryReqVO.getPageNo()).setSize(queryReqVO.getPageSize()),
@@ -1628,6 +1643,7 @@ public class ContractServiceImpl implements ContractService {
 
         // TODO 暂时返回成功
         erpResult.putOnce("success", true);
+        erpResult.putOnce("data", "success");
         /*HashMap<String, String> result = erpContractService.submitErp(erpContractVO);
         if ("E".equals(result.get("flag"))) {
             erpResult.putOnce("success", false);
@@ -1836,7 +1852,7 @@ public class ContractServiceImpl implements ContractService {
             infoRespVO.setCompanyBankAccount(contractMainDO.getSalesBankAccount());
             infoRespVO.setCompanyAccountNumber(contractMainDO.getSalesAccountNumber());
             infoRespVO.setCompanyTaxNumber(contractMainDO.getSalesTaxNumber());
-            infoRespVO.setSupplierName(contractMainDO.getPurchaseCompanyNumber());
+            infoRespVO.setSupplierNumber(contractMainDO.getPurchaseCompanyNumber());
             infoRespVO.setSupplierName(contractMainDO.getPurchaseCompanyName());
             infoRespVO.setSupplierAccountName(contractMainDO.getPurchaseAccountName());
             infoRespVO.setSupplierBankAccount(contractMainDO.getPurchaseBankAccount());
@@ -1850,7 +1866,7 @@ public class ContractServiceImpl implements ContractService {
             infoRespVO.setCompanyBankAccount(contractMainDO.getPurchaseBankAccount());
             infoRespVO.setCompanyAccountNumber(contractMainDO.getPurchaseAccountNumber());
             infoRespVO.setCompanyTaxNumber(contractMainDO.getPurchaseTaxNumber());
-            infoRespVO.setSupplierName(contractMainDO.getSalesCompanyNumber());
+            infoRespVO.setSupplierNumber(contractMainDO.getSalesCompanyNumber());
             infoRespVO.setSupplierName(contractMainDO.getSalesCompanyName());
             infoRespVO.setSupplierAccountName(contractMainDO.getSalesAccountName());
             infoRespVO.setSupplierBankAccount(contractMainDO.getSalesBankAccount());

zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCustomerMapper.xml

@@ -23,7 +23,7 @@
                 <if test="item.isProvisional != null">IS_PRVS = #{item.isProvisional},</if>
                 <if test="item.taxNumber != null">TAX_NUM = #{item.taxNumber},</if>
              </set>
-            WHERE NUM = #{item.downCenterNumber}
+            WHERE NUM = #{item.number}
         </foreach>
     </update>
 </mapper>