Merge branch 'refs/heads/dev' into test

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/CompanyRelativityMapper.java

@@ -29,5 +29,5 @@ public interface CompanyRelativityMapper extends BaseMapperX<CompanyRelativityDO
 
     List<CompanyRelaDeptDO> getPageByReq(CompanyRelativityPageReqVO pageReqVO);
 
-    void removeByIds(@Param("ids")List<Long> ids);
+    void removeByIds(@Param("ids") List<Long> ids);
 }

zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml

@@ -46,7 +46,7 @@
 
     <delete id="removeByIds">
         delete from SPLY_CPN_REL where ID in
-        <foreach item="ids" collection="list" separator="," open="(" close=")">
+        <foreach collection="ids" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
     </delete>

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/contract/ContractController.java

@@ -98,11 +98,11 @@ public class ContractController implements BusinessControllerMarker {
         return success(contractService.delete(ids));
     }
 
-    // TODO
     @PostMapping("/download")
-    @Operation(summary = "下载文件 TODO")
+    @Operation(summary = "下载文件")
     @PreAuthorize("@ss.hasPermission('base:contract:download')")
-    public void download() {
+    public void download(@RequestBody List<Long> ids) {
+        contractService.download(ids);
     }
 
     // TODO

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

@@ -32,7 +32,7 @@ public class ContractSaveReqVO {
 
     // 基础信息
     @Schema(description = "附件对象存储")
-    private String fileObject;
+    private JSONArray fileObject;
 
     @Schema(description = "其它附件对象存储")
     private JSONArray fileObjectOther;

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

@@ -5,6 +5,7 @@ import com.zt.plat.module.contractorder.api.dto.PurchaseOrderWithDetailsDTO;
 import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.*;
 import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PurchaseOrderDO;
 import com.zt.plat.module.contractorder.service.purchaseorder.PurchaseOrderService;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -127,7 +128,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 +146,21 @@ 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
+                                                            @Schema(description = "采购订单号")
+                                                            @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/PrchOrdDtlPageReqVO.java

@@ -42,7 +42,7 @@ public class PrchOrdDtlPageReqVO extends PageParam {
     private String qty;
 
     @Schema(description = "计量单位;推送ERP（必须）")
-    private BigDecimal unt;
+    private String unt;
 
     @Schema(description = "含税单价;推送ERP（必须）")
     private BigDecimal inTaxUprc;

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

@@ -55,7 +55,7 @@ public class PrchOrdDtlRespVO {
 
     @Schema(description = "计量单位;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("计量单位;推送ERP（必须）")
-    private BigDecimal unt;
+    private String unt;
 
     @Schema(description = "含税单价;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("含税单价;推送ERP（必须）")

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

@@ -51,8 +51,8 @@ public class PrchOrdDtlSaveReqVO {
     private String qty;
 
     @Schema(description = "计量单位;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "计量单位;推送ERP（必须）不能为空")
+    @NotEmpty(message = "计量单位;推送ERP（必须）不能为空")
-    private BigDecimal unt;
+    private String unt;
 
     @Schema(description = "含税单价;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "含税单价;推送ERP（必须）不能为空")