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

订单管理相关

Browse Source
This commit is contained in:
潘荣晟
2025-10-15 17:28:53 +08:00
parent 979acacd27
commit e5acac8fe3
13 changed files with 155 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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'`")
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 @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;
}
}

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

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

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

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

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

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

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

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

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

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

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

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

69
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

2
zt-module-contract-order/zt-module-contract-order-server/src/main/resources/mapper/purchaseorder/PurchaseOrderMapper.xml
View File

@@ -221,7 +221,7 @@
<select id="selectByOrderId"
resultType="com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PurchaseOrderDO">
select * from bse_prch_ord;
select * from bse_prch_ord where sys_ord_num =#{orderId};
</select>