订单管理相关

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

@@ -14,5 +14,5 @@ public interface ErrorCodeConstants {
     ErrorCode PURCHASE_ORDER_NOT_EXISTS =  new ErrorCode(1_008_000_001, "采购订单不存在");
     ErrorCode ORDER_ID_NOT_EXISTS = new ErrorCode(1_008_000_010, "订单id不能为空");
     ErrorCode PRCH_ORD_DTL_NOT_EXISTS =  new ErrorCode(1_008_001_001, "采购订单明细不存在");
-    ErrorCode PURCHASE_ORDER_STATUS_ERROR = new ErrorCode(1_008_001_020, "订单状态不存在");
+    ErrorCode PURCHASE_ORDER_STATUS_ERROR = new ErrorCode(1_008_001_020, "非法的订单状态");
 }

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

@@ -127,7 +127,7 @@ public class PurchaseOrderController implements BusinessControllerMarker {
     @PostMapping("/submit-erp061")
     @Operation(summary = "推送ERP订单", description = "061')")
     @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')")
-    public CommonResult<?> submitErp061(@RequestBody @Validated @NotNull(message = "采购订单id不能为空") List<Long> ids) {
+    public CommonResult<?> submitErp061(@RequestBody @Validated @NotEmpty(message = "采购订单id不能为空") List<Long> ids) {
         return success( purchaseOrderService.submitErp061(ids));
     }
     @PostMapping("/submit-erp062")
@@ -145,9 +145,17 @@ public class PurchaseOrderController implements BusinessControllerMarker {
     }
     //根据订单id修改订单状态
     @PutMapping("/update-order-status")
-    @Operation(summary = "根据订单id修改订单状态", description = "sts取值于字典名称'采购订单状态',字典类型'PRCH_ORD_STS'`")
+    @Operation(summary = "批量修改订单状态", description = "sts取值于字典名称'采购订单状态',字典类型'PRCH_ORD_STS' 可以根据订单号和订单id修改")
-    public CommonResult<Boolean> updateOrderStatus(@RequestParam("orderId") Long orderId, @RequestParam("sts") String sts){
+    public CommonResult<Boolean> updateOrderStatus(@RequestBody @Validated PurchaseOrderStsReqVO req){
-        return success(purchaseOrderService.updateOrderStatus(orderId,sts));
+        purchaseOrderService.updateOrderStatusByIdOrOrderNo(req);
+        return success(true);
+    }
+
+    //查询物料接口
+    @GetMapping("/material")
+    @Operation(summary = "查询物料接口")
+    public CommonResult<MaterialRespVO> getMaterialList(@RequestParam @Validated @NotEmpty(message = "采购订单号不能为空") String orderNo){
+        return purchaseOrderService.getMaterial(orderNo);
     }
 
 }

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

@@ -0,0 +1,34 @@
+package com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@Schema(description = "管理后台 - 物料响应 VO")
+public class MaterialRespVO {
+    @Schema(description = "订单号")
+    private String orderNo;
+    @Schema(description = "订单id")
+    private String id;
+    @Schema(description = "物料类型")
+    private String materialType;
+    @Schema(description = "物料单位")
+    private String materialUnit;
+    @Schema(description = "物料明细")
+    private List<MaterialDetails> materialDetails;
+
+    @Data
+    public static class MaterialDetails {
+        @Schema(description = "物料名称")
+        private String materialName;
+        @Schema(description = "物料编码")
+        private String materialCode;
+        @Schema(description = "物料类型")
+        private String materialType;
+        @Schema(description = "物料单位")
+        private String materialUnit;
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+
+import java.util.List;
+
+
+@Schema(description = "管理后台 - 采购订单状态 Request VO")
+@Data
+@ExcelIgnoreUnannotated
+public class PurchaseOrderStsReqVO {
+    @Schema(description = "采购订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "26419")
+    private List<Long> ids;
+    @Schema(description = "采购订单状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotEmpty(message = "采购订单状态不能为空")
+    private String sts;
+    @Schema(description = "采购订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private List<String> orderNos;
+}

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

@@ -89,7 +89,7 @@ public class PrchOrdDtlDO extends BusinessBaseDO {
     * 计量单位;推送ERP（必须）
     */
     @TableField("UNT")
-    private BigDecimal unt;
+    private String unt;
     /**
     * 含税单价;推送ERP（必须）
     */

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

@@ -238,6 +238,11 @@ public class PurchaseOrderDO extends BusinessBaseDO {
     @TableField("IS_PUSH")
     private int isPush;
 
+    /**
+     * 计量单位
+     */
+    @TableField("UNT")
+    private String unt;
 
     /**
      * 物料字典

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

@@ -75,4 +75,6 @@ public interface PrchOrdDtlService {
      * @param ordIds 编号
      */
     void deletePrchOrdDtlListByOrdIds(List<Long> ordIds);
+
+    List<PrchOrdDtlDO> getDetailsByOrderId(Long ordId);
 }

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

@@ -113,4 +113,10 @@ public class PrchOrdDtlServiceImpl implements PrchOrdDtlService {
         deletePrchOrdDtlListByIds(convertList(prchOrdDtlDOS, PrchOrdDtlDO::getId));
     }
 
+    @Override
+    public List<PrchOrdDtlDO> getDetailsByOrderId(Long ordId) {
+
+        return prchOrdDtlMapper.selectList(new LambdaQueryWrapper<>(PrchOrdDtlDO.class).eq(PrchOrdDtlDO::getOrdId, ordId));
+    }
+
 }

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

@@ -2,6 +2,7 @@ package com.zt.plat.module.contractorder.service.purchaseorder;
 
 import java.util.*;
 
+import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.*;
 import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PurchaseOrderDO;
 import jakarta.validation.*;
@@ -83,4 +84,7 @@ public interface PurchaseOrderService {
     List<PurchaseOrderDetailsRespVO> getOrderByOrderNo(List<String> orderNo);
 
     void setOrderDetails(PurchaseOrderRespVO purchaseOrderRespVO);
+    void updateOrderStatusByIdOrOrderNo(PurchaseOrderStsReqVO reqVO);
+
+    CommonResult<MaterialRespVO> getMaterial(String orderNo);
 }