Merge branch 'dev' into test

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

@@ -99,5 +99,9 @@ public class EntrustOrderDetailPageReqVO extends PageParam {
     //税率
     @Schema(description = "税率")
     private BigDecimal taxRate;
+    @Schema(description = "回收率")
+    private BigDecimal recoveryRate;
+    @Schema(description = "行项目号")
+    private Integer lineNumber;
 
 }

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

@@ -141,4 +141,10 @@ public class EntrustOrderDetailRespVO {
     @Schema(description = "税率")
     @ExcelProperty("税率")
     private BigDecimal taxRate;
+    @Schema(description = "回收率")
+    @ExcelProperty("回收率")
+    private BigDecimal recoveryRate;
+    @Schema(description = "行项目号")
+    @ExcelProperty("行项目号")
+    private Integer lineNumber;
 }

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

@@ -101,4 +101,8 @@ public class EntrustOrderDetailSaveReqVO {
     private String sendMaterialName;
     @Schema(description = "税率")
     private BigDecimal taxRate;
+    @Schema(description = "回收率")
+    private BigDecimal recoveryRate;
+    @Schema(description = "行项目号")
+    private Integer lineNumber;
 }

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

@@ -149,7 +149,7 @@ public class PurchaseOrderController implements BusinessControllerMarker {
     public CommonResult<?> submitErp061(@RequestBody @Validated @NotEmpty(message = "采购订单id不能为空") List<String> idsStr) {
         List<Long> ids = idsStr.stream().map(Long::valueOf).toList();
         // todo 推送ERP订单
-        return customize(purchaseOrderService.submitErp061(ids),200,"推送成功");
+        return success(purchaseOrderService.submitErp061(ids));
     }
 
     @PostMapping("/submit-erp062")

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

@@ -170,4 +170,10 @@ public class EntrustOrderDetailDO extends BusinessBaseDO {
 
     @TableField("TAX_RTE")
     private BigDecimal taxRate;
+
+    @TableField("RCV_RTE")
+    private BigDecimal recoveryRate;
+
+    @TableField("LINE_NUM")
+    private Integer lineNumber;
 }

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

@@ -39,6 +39,8 @@ public interface EntrustOrderDetailMapper extends BaseMapperX<EntrustOrderDetail
                 .betweenIfPresent(EntrustOrderDetailDO::getCreateTime, reqVO.getCreateTime())
                 .likeIfPresent(EntrustOrderDetailDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(EntrustOrderDetailDO::getTaxRate, reqVO.getTaxRate())
+                .eqIfPresent(EntrustOrderDetailDO::getRecoveryRate, reqVO.getRecoveryRate())
+                .eqIfPresent(EntrustOrderDetailDO::getLineNumber, reqVO.getLineNumber())
                 .orderByDesc(EntrustOrderDetailDO::getId));
     }
 

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpWarehouseDO.java

@@ -20,7 +20,7 @@ import lombok.*;
 /**
 * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
 */
-public class ErpWarehouseDO extends BusinessBaseDO {
+public class ErpWarehouseDO extends BaseDO {
 
     /**
     * 主键

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpWarehouseMapper.java

@@ -8,6 +8,7 @@ import com.zt.plat.module.erp.controller.admin.erp.vo.ErpWarehousePageReqVO;
 import com.zt.plat.module.erp.dal.dataobject.erp.ErpSalesOrganizationDO;
 import com.zt.plat.module.erp.dal.dataobject.erp.ErpWarehouseDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -40,5 +41,10 @@ public interface ErpWarehouseMapper extends BaseMapperX<ErpWarehouseDO> {
                 .orderByDesc(ErpWarehouseDO::getId));
     }
 
+    List<ErpWarehouseDO> selectWarehouseByDynamicParams(
+            @Param("paramReqVO") ErpWarehousePageReqVO reqVO,
+            @Param("pageNum") Integer pageNum,
+            @Param("pageSize") Integer pageSize);
 
+    Long selectWarehouseByDynamicParamsCount(@Param("paramReqVO") ErpWarehousePageReqVO reqVO);
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java

@@ -192,6 +192,7 @@ public PageResult<ErpWarehouseDO> getErpWarehousePageDistinctByFactory(ErpWareho
 
     @Override
     public PageResult<ErpWarehouseDO> getErpWarehousePage(ErpWarehousePageReqVO pageReqVO) {
+        return new PageResult<>(erpWarehouseMapper.selectWarehouseByDynamicParams(pageReqVO, pageReqVO.getPageNo(), pageReqVO.getPageSize()), erpWarehouseMapper.selectWarehouseByDynamicParamsCount(pageReqVO));
         //        PageResult<ErpWarehouseRespVO> erpWarehouseRespVOPageResult = BeanUtils.toBean(erpWarehouseMapper.selectPage(pageReqVO), ErpWarehouseRespVO.class);
 //        if (erpWarehouseRespVOPageResult.getList() == null) {
 //            return erpWarehouseRespVOPageResult;
@@ -199,24 +200,24 @@ public PageResult<ErpWarehouseDO> getErpWarehousePageDistinctByFactory(ErpWareho
 //        erpWarehouseRespVOPageResult.getList().forEach(this::setWarehouseFactoryInfo);
 //        return erpWarehouseRespVOPageResult;
         // 获取分页数据
-        List<ErpWarehouseDO> list = erpWarehouseMapper.getPageByReq(pageReqVO);
+//        List<ErpWarehouseDO> list = erpWarehouseMapper.getPageByReq(pageReqVO);
-        if (list == null) {
+//        if (list == null) {
-            list = CollUtil.newArrayList();
+//            list = CollUtil.newArrayList();
-        }
+//        }
-        // 分页处理
+//        // 分页处理
-        int pageNo = pageReqVO.getPageNo();
+//        int pageNo = pageReqVO.getPageNo();
-        int pageSize = pageReqVO.getPageSize();
+//        int pageSize = pageReqVO.getPageSize();
-        int total = list.size();
+//        int total = list.size();
-        // 计算分页起始和结束位置
+//        // 计算分页起始和结束位置
-        int fromIndex = (pageNo - 1) * pageSize;
+//        int fromIndex = (pageNo - 1) * pageSize;
-        int toIndex = Math.min(fromIndex + pageSize, total);
+//        int toIndex = Math.min(fromIndex + pageSize, total);
-        // 如果起始位置超出范围，则返回空列表
+//        // 如果起始位置超出范围，则返回空列表
-        if (fromIndex >= total) {
+//        if (fromIndex >= total) {
-            return new PageResult<>(new ArrayList<>(), (long) total);
+//            return new PageResult<>(new ArrayList<>(), (long) total);
-        }
+//        }
-        // 截取当前页数据
+//        // 截取当前页数据
-        List<ErpWarehouseDO> pageList = list.subList(fromIndex, toIndex);
+//        List<ErpWarehouseDO> pageList = list.subList(fromIndex, toIndex);
-        return new PageResult<>(pageList, (long) total);
+//        return new PageResult<>(pageList, (long) total);
     }
 
     // 设置主物料信息