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

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/PurchaseOrderWithDetailsDTO.java

@@ -189,6 +189,10 @@ public class PurchaseOrderWithDetailsDTO {
      *  订单类型
      */
     private String splyBsnTp;
+    /**
+     * 税码
+     */
+    private String taxNum;
     /**
      * 采购订单明细
      */

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DemotesQueryReqVO.java

@@ -1,11 +1,12 @@
 package com.zt.plat.module.contractorder.api.vo.contract;
 
+import com.zt.plat.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Schema(description = "管理后台 - 查询参数降级规则列表 Request VO")
 @Data
-public class DemotesQueryReqVO {
+public class DemotesQueryReqVO extends PageParam {
 
     @Schema(description = "合同名称")
     private String contractName;

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/FormulasQueryReqVO.java

@@ -1,11 +1,12 @@
 package com.zt.plat.module.contractorder.api.vo.contract;
 
+import com.zt.plat.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Schema(description = "管理后台 - 查询结算公式列表 Request VO")
 @Data
-public class FormulasQueryReqVO {
+public class FormulasQueryReqVO extends PageParam {
 
     @Schema(description = "合同名称")
     private String contractName;

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/NotsQueryReqVO.java

@@ -1,11 +1,12 @@
 package com.zt.plat.module.contractorder.api.vo.contract;
 
+import com.zt.plat.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Schema(description = "管理后台 - 查询不计价规则列表 Request VO")
 @Data
-public class NotsQueryReqVO {
+public class NotsQueryReqVO extends PageParam {
 
     @Schema(description = "合同名称")
     private String contractName;

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

@@ -51,21 +51,21 @@ public class ContractController implements BusinessControllerMarker {
     @GetMapping("/nots")
     @Operation(summary = "查询不计价规则列表")
     @PreAuthorize("@ss.hasPermission('base:contract:query')")
-    public CommonResult<List<NotRespVO>> getNots(NotsQueryReqVO queryReqVO) {
+    public CommonResult<PageResult<NotRespVO>> getNots(NotsQueryReqVO queryReqVO) {
         return success(contractService.getNots(queryReqVO));
     }
 
     @GetMapping("/demotes")
     @Operation(summary = "查询参数降级规则列表")
     @PreAuthorize("@ss.hasPermission('base:contract:query')")
-    public CommonResult<List<DemoteRespVO>> getDemotes(DemotesQueryReqVO queryReqVO) {
+    public CommonResult<PageResult<DemoteRespVO>> getDemotes(DemotesQueryReqVO queryReqVO) {
         return success(contractService.getDemotes(queryReqVO));
     }
 
     @GetMapping("/formulas")
     @Operation(summary = "查询结算公式列表")
     @PreAuthorize("@ss.hasPermission('base:contract:query')")
-    public CommonResult<List<FormulaRespVO>> getFormulas(FormulasQueryReqVO queryReqVO) {
+    public CommonResult<PageResult<FormulaRespVO>> getFormulas(FormulasQueryReqVO queryReqVO) {
         return success(contractService.getFormulas(queryReqVO));
     }
 

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

@@ -144,20 +144,16 @@ public class PurchaseOrderController implements BusinessControllerMarker {
     @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')")
     public CommonResult<?> submitErp061(@RequestBody @Validated @NotEmpty(message = "采购订单id不能为空") List<String> idsStr) {
         List<Long> ids = idsStr.stream().map(Long::valueOf).toList();
-        // TODO 推送ERP订单
+        // todo 推送ERP订单
-      //  purchaseOrderService.submitErp061(ids);
+        return success(purchaseOrderService.submitErp061(ids));
-        //随机生成六位数
-
-        return success(R());
     }
 
     @PostMapping("/submit-erp062")
     @Operation(summary = "推送ERP订单", description = "062当每次调更新接口后都需要调此接口")
     @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')")
     public CommonResult<?> submitErp062(@RequestParam @Validated @NotNull(message = "采购订单id不能为空") String id) {
-        //TODO 推送ERP订单
+        // todo 推送ERP订单
-
+        return success(purchaseOrderService.submitErp062(Long.valueOf(id)));
-        return success(R());
     }
 
     //通过订单号查询订单信息
@@ -213,8 +209,5 @@ public class PurchaseOrderController implements BusinessControllerMarker {
         return success(purchaseOrderService.getBindOrderByOrder(reqVO));
     }
 
-    private String R(){
+
-        int number = (int) (Math.random() * 900000 + 100000);
-        return String.valueOf(number);
-    }
 }

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

@@ -129,8 +129,9 @@ public class SalesOrderController implements BusinessControllerMarker {
     //推送erp091
     @PostMapping("/push-erp091")
     @Operation(summary = "推送erp091")
-    public CommonResult<Boolean> pushErp091(@RequestParam("id") String id) {
+    public CommonResult<Boolean> pushErp091(@RequestBody @Validated @NotEmpty(message = "销售订单id不能为空") List<String> ids) {
-        return success(salesOrderService.pushErp091(id));
+        ids.forEach(id -> salesOrderService.pushErp091(id));
+        return success(true);
     }
 
     //提交审批

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDO.java

@@ -303,4 +303,9 @@ public class SalesOrderDO extends BusinessBaseDO {
      */
     @TableField("PYER_NUM")
     private String payerNum;
+    /**
+     * 税码
+     */
+    @TableField("TAX_NUM")
+    private String taxNum;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java

@@ -1,5 +1,6 @@
 package com.zt.plat.module.contractorder.dal.mysql.contract;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import com.zt.plat.module.contractorder.api.vo.contract.DemoteRespVO;
 import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractDemoteDO;
@@ -22,7 +23,7 @@ public interface ContractDemoteMapper extends BaseMapperX<ContractDemoteDO> {
             ", (select ctrt_name from BSE_CTRT_MAIN where id = ctrt_id) contractName",
             ", (select ctrt_ppr_num from BSE_CTRT_MAIN where id = ctrt_id) contractPaperNumber",
             "from bse_ctrt_dmot",
-            "where 1 = 1",
+            "where DELETED = 0",
             "<if test= \"contractIds != null and contractIds.size() > 0\">",
             "and ctrt_id in",
             "<foreach collection = 'contractIds' item = 'contractId' open='(' separator = ',' close = ')'>",
@@ -37,5 +38,5 @@ public interface ContractDemoteMapper extends BaseMapperX<ContractDemoteDO> {
             "</if>",
             "</script>"
     })
-    List<DemoteRespVO> selectDemotes(List<Long> contractIds, String materialName, String elementName);
+    IPage<DemoteRespVO> selectDemotes(IPage<?> page, List<Long> contractIds, String materialName, String elementName);
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java

@@ -1,5 +1,6 @@
 package com.zt.plat.module.contractorder.dal.mysql.contract;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import com.zt.plat.module.contractorder.api.vo.contract.FormulaRespVO;
 import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractFormulaDO;
@@ -22,7 +23,7 @@ public interface ContractFormulaMapper extends BaseMapperX<ContractFormulaDO> {
             ", (select ctrt_name from BSE_CTRT_MAIN where id = ctrt_id) contractName",
             ", (select ctrt_ppr_num from BSE_CTRT_MAIN where id = ctrt_id) contractPaperNumber",
             "from bse_ctrt_fmu",
-            "where 1 = 1",
+            "where DELETED = 0",
             "<if test= \"contractIds != null and contractIds.size() > 0\">",
             "and ctrt_id in",
             "<foreach collection = 'contractIds' item = 'contractId' open='(' separator = ',' close = ')'>",
@@ -37,5 +38,5 @@ public interface ContractFormulaMapper extends BaseMapperX<ContractFormulaDO> {
             "</if>",
             "</script>"
     })
-    List<FormulaRespVO> selectFormulas(List<Long> contractIds, String materialName, String elementName);
+    IPage<FormulaRespVO> selectFormulas(IPage<?> page, List<Long> contractIds, String materialName, String elementName);
 }