委托加工和回收率管理优化

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));
     }