zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/dev' into test

Browse Source
This commit is contained in:
liss
2025-10-16 10:31:49 +08:00
parent 806cf51cee 63f377b4b5
commit 45d943a2dc
25 changed files with 214 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java
View File

@@ -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

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

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

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

@@ -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'`")
public CommonResult<Boolean> updateOrderStatus(@RequestParam("orderId") Long orderId, @RequestParam("sts") String sts){
return success(purchaseOrderService.updateOrderStatus(orderId,sts));
@Operation(summary = "批量修改订单状态", description = "sts取值于字典名称'采购订单状态',字典类型'PRCH_ORD_STS' 可以根据订单号和订单id修改")
public CommonResult<Boolean> updateOrderStatus(@RequestBody @Validated PurchaseOrderStsReqVO req){
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);
}
}

34
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/MaterialRespVO.java Normal file
View File

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

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PrchOrdDtlPageReqVO.java
View File

@@ -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;

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

@@ -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（必须）")

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

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

3
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderPageReqVO.java
View File

@@ -54,6 +54,9 @@ public class PurchaseOrderPageReqVO extends PageParam {
@Schema(description = "采购组编码(字典:PRCH_GRP_TP);推送ERP（必须）")
private String purchaseGroup;
@Schema(description = "计量单位")
private String unt;
@Schema(description = "货币码(字典:CUR);推送ERP（必须）")
private String currencyNumber;

3
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderRespVO.java
View File

@@ -65,6 +65,9 @@ public class PurchaseOrderRespVO {
@ExcelProperty("收货库位编码;推送ERP")
private String receiveWarehouseNumber;
@Schema(description = "计量单位")
private String unt;
@Schema(description = "采购组编码(字典:PRCH_GRP_TP);推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("采购组编码(字典:PRCH_GRP_TP);推送ERP（必须）")
private String purchaseGroup;

5
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderSaveReqVO.java
View File

@@ -99,6 +99,11 @@ public class PurchaseOrderSaveReqVO {
// @NotEmpty(message = "订单编码不能为空")
// private String orderNumber;
@Schema(description = "计量单位")
@NotEmpty(message = "计量单位(unt)不能为空")
private String unt;
@Schema(description = "系统合同编号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "系统合同编号不能为空")
private String contractNumber;

Some files were not shown because too many files have changed in this diff Show More