委托加工订单接口相关实现

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/ErpConstants.java

@@ -16,4 +16,5 @@ public class ErpConstants {
     public static final String SALES_DOCUMENT_REQUEST_FLAG_U = "U";//更新
     public static final String SALES_DOCUMENT_REQUEST_FLAG_D = "D";//删除
     public static final String SALES_DOCUMENT_REQUEST_FLAG_I = "I";//插入
+    public static final String CONSTANTS_L = "L";//科目类别L
 }

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

@@ -57,7 +57,7 @@ public class EntrustOrderDetailPageReqVO extends PageParam {
     private LocalDateTime[] deliveryCargoEndDate;
 
     @Schema(description = "是否启用")
-    private Boolean isEnable;
+    private String isEnable;
 
     @Schema(description = "短文本")
     private String shortText;

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

@@ -1,5 +1,6 @@
 package com.zt.plat.module.contractorder.controller.admin.entrustorder.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -47,18 +48,21 @@ public class EntrustOrderDetailRespVO {
     @Schema(description = "收货库位名称", example = "张三")
     @ExcelProperty("收货库位名称")
     private String receiveWarehouseName;
-
     @Schema(description = "收货库位编码")
     @ExcelProperty("收货库位编码")
     private String receiveWarehouseNumber;
-
+    @Schema(description = "发货物料名称", example = "张三")
-    @Schema(description = "物料名称", example = "赵六")
+    @ExcelProperty("发货物料名称")
-    @ExcelProperty("物料名称")
+    private String sendMaterialName;
-    private String materialName;
+    @Schema(description = "发货物料编码", example = "李四")
-
+    @ExcelProperty("发货物料编码")
-    @Schema(description = "物料编码")
+    private String sendMaterialNumber;
-    @ExcelProperty("物料编码")
+    @Schema(description = "收货物料名称", example = "王五")
-    private String materialNumber;
+    @ExcelProperty("收货物料名称")
+    private String receiveMaterialName;
+    @Schema(description = "收货物料编码", example = "王五")
+    @ExcelProperty("收货物料编码")
+    private String receiveMaterialNumber;
 
     @Schema(description = "发货计量单位")
     @ExcelProperty("发货计量单位")
@@ -85,7 +89,7 @@ public class EntrustOrderDetailRespVO {
 
     @Schema(description = "是否启用")
     @ExcelProperty("是否启用")
-    private Boolean isEnable;
+    private String isEnable;
 
     @Schema(description = "短文本")
     @ExcelProperty("短文本")
@@ -125,19 +129,6 @@ public class EntrustOrderDetailRespVO {
     @Schema(description = "备注")
     @ExcelProperty("备注")
     private String remark;
-    @Schema(description = "收货物料编码")
-    @ExcelProperty("收货物料编码")
-    private String receiveMaterialNumber;
-    @Schema(description = "收货物料名称")
-    @ExcelProperty("收货物料名称")
-    private String receiveMaterialName;
-    @Schema(description = "发货物料编码")
-    @ExcelProperty("发货物料编码")
-    private String sendMaterialNumber;
-    @Schema(description = "发货物料名称")
-    @ExcelProperty("发货物料名称")
-    private String sendMaterialName;
-
     @Schema(description = "税率")
     @ExcelProperty("税率")
     private BigDecimal taxRate;
@@ -147,4 +138,9 @@ public class EntrustOrderDetailRespVO {
     @Schema(description = "行项目号")
     @ExcelProperty("行项目号")
     private Integer lineNumber;
+
+    @Schema(description = "删除标识")
+    @ExcelProperty("删除标识")
+    private Boolean deleted;
+
 }

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

@@ -64,7 +64,7 @@ public class EntrustOrderDetailSaveReqVO {
     private LocalDateTime deliveryCargoEndDate;
 
     @Schema(description = "是否启用")
-    private Boolean isEnable;
+    private String isEnable;
 
     @Schema(description = "短文本")
     private String shortText;

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

@@ -3,8 +3,11 @@ package com.zt.plat.module.contractorder.controller.admin.entrustorder.vo;
 import lombok.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import com.zt.plat.framework.common.pojo.PageParam;
+
 import java.math.BigDecimal;
+
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -125,4 +128,7 @@ public class EntrustOrderOrderPageReqVO extends PageParam {
     @Schema(description = "计量单位", example = "张三")
     private String unit;
 
+    @Schema(description = "物料类型", example = "张三")
+    private String mtrlTp;
+
 }

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

@@ -28,6 +28,9 @@ public class EntrustOrderOrderRespVO {
 
     @Schema(description = "公司编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("公司编码;推送ERP（必须）")
+    private String cpNum;
+    @Schema(description = "公司名称;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("公司名称;推送ERP（必须）")
     private String cpName;
 
     @Schema(description = "客商编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -164,10 +167,12 @@ public class EntrustOrderOrderRespVO {
 
     @Schema(description = "委托加工订单明细")
     @ExcelProperty("委托加工订单明细")
-    private List<EntrustOrderDetailRespVO> entrustOrderDetails;
+    private List<EntrustOrderDetailRespVO> details;
 
     @ExcelProperty("计量单位")
     @Schema(description = "计量单位", example = "张三")
     private String unit;
-
+    @ExcelProperty("物料类型")
+    @Schema(description = "物料类型", example = "张三")
+    private String mtrlTp;
 }

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

@@ -144,9 +144,12 @@ public class EntrustOrderOrderSaveReqVO {
     private LocalDateTime createTime;
 
     @Schema(description = "委托加工订单明细")
-    private List<EntrustOrderDetailSaveReqVO> entrustOrderDetails;
+    private List<EntrustOrderDetailSaveReqVO> details;
 
     @Schema(description = "计量单位", example = "张三")
     private String unit;
 
+    @Schema(description = "物料类型", example = "张三")
+    private String mtrlTp;
+
 }

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

@@ -146,10 +146,8 @@ public class PurchaseOrderController implements BusinessControllerMarker {
     @PostMapping("/submit-erp061")
     @Operation(summary = "推送ERP订单", description = "061')")
     @PreAuthorize("@ss.hasAnyPermissions('base:purchase-order:update','purchase:order:list:OrderList:edit')")
-    public CommonResult<?> submitErp061(@RequestBody @Validated @NotEmpty(message = "采购订单id不能为空") List<String> idsStr) {
+    public CommonResult<?> submitErp061(@RequestParam("id") String id) {
-        List<Long> ids = idsStr.stream().map(Long::valueOf).toList();
+        return success(purchaseOrderService.submitErp061(List.of(Long.valueOf(id))));
-        // todo 推送ERP订单
-        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/controller/admin/salesorder/SalesOrderController.java

@@ -148,8 +148,8 @@ public class SalesOrderController implements BusinessControllerMarker {
     @PostMapping("/push-erp091")
     @Operation(summary = "推送erp091")
     @PreAuthorize("@ss.hasAnyPermissions('base:purchase-order:update','sale:order:list:OrderList:edit')")
-    public CommonResult<Boolean> pushErp091(@RequestBody @Validated @NotEmpty(message = "销售订单id不能为空") List<String> ids) {
+    public CommonResult<Boolean> pushErp091(@RequestParam("id") String id) {
-        ids.forEach(id -> salesOrderService.pushErp091(id));
+        salesOrderService.pushErp091(id);
         return success(true);
     }
 
@@ -209,6 +209,7 @@ public class SalesOrderController implements BusinessControllerMarker {
         salesOrderService.updateOrderStatusByIdOrOrderNo(req);
         return success(true);
     }
+
     //feign测试
     @GetMapping("/get-sales-order-details-by-order-id")
     public CommonResult<?> getSalesOrderDetailsByOrderId(@RequestParam("orderId") Long orderId) {