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

新增库位绑定Feign接口与合并采购销售订单

Browse Source
This commit is contained in:
潘荣晟
2026-02-02 17:53:14 +08:00
parent 726303ce81
commit 0033bdc4c5
20 changed files with 646 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,23 @@ public class EntrustOrderDetailRespVO {
@Schema(description = "订单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8625")
private Long orderId;
@Schema(description = "发货工厂名称", example = "张三")
@ExcelProperty("发货工厂名称")
private String sendFactoryName;
@Schema(description = "发货工厂编码")
@ExcelProperty("发货工厂编码")
private String sendFactoryNumber;
@Schema(description = "发货库位名称", example = "李四")
@ExcelProperty("发货库位名称")
private String sendWarehouseName;
@Schema(description = "发货库位编码")
@ExcelProperty("发货库位编码")
private String sendWarehouseNumber;
@Schema(description = "收货工厂名称", example = "赵六")
@ExcelProperty("收货工厂名称")
private String receiveFactoryName;

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

@@ -19,6 +19,15 @@ public class EntrustOrderDetailSaveReqVO {
@Schema(description = "订单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8625")
private Long orderId;
@Schema(description = "发货工厂名称", example = "张三")
private String sendFactoryName;
@Schema(description = "发货工厂编码")
private String sendFactoryNumber;
@Schema(description = "发货库位名称", example = "李四")
private String sendWarehouseName;
@Schema(description = "发货库位编码")
private String sendWarehouseNumber;
@Schema(description = "收货工厂名称", example = "赵六")
private String receiveFactoryName;

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

@@ -21,10 +21,12 @@ public class EntrustOrderOrderSaveReqVO {
// @NotEmpty(message = "订单号不能为空")
private String systemOrderNumber;
@Schema(description = "公司编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
//@NotEmpty(message = "公司编码;推送ERP（必须）不能为空")
@Schema(description = "公司名称;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
private String cpName;
@Schema(description = "公司编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
private String cpNum;
@Schema(description = "客商编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
//@NotEmpty(message = "客商编码;推送ERP（必须）不能为空")
private String supplierNumber;

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

@@ -71,7 +71,7 @@ public class PrchOrdDtlController implements BusinessControllerMarker {
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除采购订单明细")
@PreAuthorize("@ss.hasAnyPermissions('base:prch-ord-dtl:delete','purchase:order:list:OrderList:delete')")
@PreAuthorize("@ss.hasAnyPermissions('base:prch-ord-dtl:delete','purchase:order:list:OrderList:delete','purchase:order:list:OrderList:delete')")
public CommonResult<Boolean> deletePrchOrdDtlList(@RequestBody BatchDeleteReqVO req) {
prchOrdDtlService.deletePrchOrdDtlListByIds(req.getIds());
return success(true);

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

@@ -28,6 +28,7 @@ import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.customize;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -148,7 +149,7 @@ public class PurchaseOrderController implements BusinessControllerMarker {
public CommonResult<?> submitErp061(@RequestBody @Validated @NotEmpty(message = "采购订单id不能为空") List<String> idsStr) {
List<Long> ids = idsStr.stream().map(Long::valueOf).toList();
// todo 推送ERP订单
return success(purchaseOrderService.submitErp061(ids));
return customize(purchaseOrderService.submitErp061(ids),200,"推送成功");
}
@PostMapping("/submit-erp062")
@@ -156,7 +157,7 @@ public class PurchaseOrderController implements BusinessControllerMarker {
@PreAuthorize("@ss.hasAnyPermissions('base:purchase-order:update','purchase:order:list:OrderList:edit')")
public CommonResult<?> submitErp062(@RequestParam @Validated @NotNull(message = "采购订单id不能为空") String id) {
// todo 推送ERP订单
return success(purchaseOrderService.submitErp062(Long.valueOf(id)));
return success(purchaseOrderService.submitErp062ByUpdate(Long.valueOf(id)));
}
//通过订单号查询订单信息

1
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

@@ -153,6 +153,7 @@ public class PurchaseOrderSaveReqVO {
@Schema(description = "订单明细")
@ExcelProperty("订单明细")
@NotNull(message = "订单明细不能为空")
private List<PrchOrdDtlSaveReqVO> details;

20
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/entrustorder/EntrustOrderDetailDO.java
View File

@@ -40,6 +40,26 @@ public class EntrustOrderDetailDO extends BusinessBaseDO {
*/
@TableField("ORD_ID")
private Long orderId;
/**
* 发货工厂名称
*/
@TableField("SND_FACT_NAME")
private String sendFactoryName;
/**
* 发货工厂编码
*/
@TableField("SND_FACT_NUM")
private String sendFactoryNumber;
/**
* 发货库位名称
*/
@TableField("SND_WRH_NAME")
private String sendWarehouseName;
/**
* 发货库位编码
*/
@TableField("SND_WRH_NUM")
private String sendWarehouseNumber;
/**
* 收货工厂名称
*/

4
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PrchOrdDtlMapper.java
View File

@@ -71,4 +71,8 @@ public interface PrchOrdDtlMapper extends BaseMapperX<PrchOrdDtlDO> {
.orderByDesc(PrchOrdDtlDO::getId));
}
PrchOrdDtlDO findOrdDtlById(Long id);
PrchOrdDtlDO selectByLineNumAndOrdId(Long lineNum, Long ordId);
}

4
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java
View File

@@ -74,4 +74,8 @@ public interface PurchaseOrderMapper extends BaseMapperX<PurchaseOrderDO> {
PurchaseOrderDO selectByOrderId(@Param("orderId") Long orderId);
List<PurchaseOrderDO> queryOrderAndPlanData(OrderAndPlanDataReqDTO reqDTO);
List<PurchaseOrderWithDetailsVO> selectOrderByAndAllIds(@Param("ids") List<Long> ids);
PurchaseOrderDO findOrderById(@Param("id") Long id);
}

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

@@ -1818,7 +1818,9 @@ public class ContractServiceImpl implements ContractService {
// TODO 暂时返回成功
// erpResult.putOnce("success", true);
// erpResult.putOnce("data", "success");
log.info("ERP请求参数：{}", erpContractVO);
Map<String, String> result = erpContractService.submitErp(erpContractVO);
if ("E".equals(result.get("flag"))) {
erpResult.putOnce("success", false);
erpResult.putOnce("errMsg", result.get("resStr")+":"+result.get("E_RESP"));

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