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

4
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpOrderUpdateReqVO.java
View File

@@ -27,7 +27,7 @@ public class ErpOrderUpdateReqVO {
@Schema(description = "删除标识（ELOEK）", example = " ")
@ExcelProperty("删除标识")
private Integer deleteInd;
private String deleteInd;
@Schema(description = "货币码（WAERS）", requiredMode = Schema.RequiredMode.REQUIRED, example = "CNY")
@NotEmpty(message = "货币码不能为空")
@@ -163,7 +163,7 @@ public class ErpOrderUpdateReqVO {
@Schema(description = "行项目删除标识（ELOEK）", example = "N")
@ExcelProperty("行项目删除标识")
private Integer delete_ind;
private String delete_ind;
}
@Data

15
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java
View File

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
@@ -17,6 +18,8 @@ import com.zt.plat.module.erp.dal.mysql.erp.ErpContractMapper;
import com.zt.plat.module.erp.enums.OftenEnum;
import com.zt.plat.module.erp.utils.ErpConfig;
import com.zt.plat.module.erp.utils.MyRedisConfig;
import com.zt.plat.module.system.api.user.AdminUserApi;
import com.zt.plat.module.system.api.user.dto.AdminUserRespDTO;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -51,6 +54,8 @@ public class ErpContractServiceImpl implements ErpContractService {
@Resource
public ErpExternalApi erpExternalApi;
@Resource
private AdminUserApi adminUserApi;
@Override
public ErpContractRespVO createErpContract(ErpContractSaveReqVO createReqVO) {
// 插入
@@ -242,13 +247,13 @@ public class ErpContractServiceImpl implements ErpContractService {
erpContract.setId(erpContractDO.getId());
erpContractMapper.updateById(erpContract);
}
AdminUserRespDTO work = getWorkId();
// 构建ERP接口的参数
ErpSubmitReqDTO erpSubmitReqDTO = new ErpSubmitReqDTO();
erpSubmitReqDTO.setFuncnr("060");
erpSubmitReqDTO.setBskey(erpContract.getContractPaperNumber());
erpSubmitReqDTO.setUsrid(SecurityFrameworkUtils.getLoginUserId().toString());
erpSubmitReqDTO.setUsrnm(SecurityFrameworkUtils.getLoginUserNickname());
erpSubmitReqDTO.setUsrid(work.getWorkcode());
erpSubmitReqDTO.setUsrnm(work.getUsername());
Map<String, Object> head = new HashMap<>();
// CZBS 操作标识 枚举值0：新增 1：修改
@@ -403,4 +408,8 @@ public class ErpContractServiceImpl implements ErpContractService {
this.allnumbers = allnumbers;
}
}
private AdminUserRespDTO getWorkId(){
CommonResult<AdminUserRespDTO> user = adminUserApi.getUser(SecurityFrameworkUtils.getLoginUserId());
return user.getData();
}
}

31
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpOrderServiceImpl.java
View File

@@ -3,6 +3,7 @@ package com.zt.plat.module.erp.service.erp;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
import com.zt.plat.module.erp.api.ErpExternalApi;
import com.zt.plat.module.erp.api.dto.ErpSubmitReqDTO;
@@ -10,6 +11,8 @@ import com.zt.plat.module.erp.controller.admin.erp.vo.ErpBillMainSaveReqVO;
import com.zt.plat.module.erp.controller.admin.erp.vo.ErpOrderSaveReqVO;
import com.zt.plat.module.erp.controller.admin.erp.vo.ErpOrderUpdateReqVO;
import com.zt.plat.module.erp.controller.admin.erp.vo.ErpSalesOrderSaveReqVO;
import com.zt.plat.module.system.api.user.AdminUserApi;
import com.zt.plat.module.system.api.user.dto.AdminUserRespDTO;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
@@ -22,6 +25,8 @@ import java.util.Map;
public class ErpOrderServiceImpl implements ErpOrderService {
@Resource
public ErpExternalApi erpExternalApi;
@Resource
private AdminUserApi adminUserApi;
@Override
public String submitOrderToErp061(ErpOrderSaveReqVO createVo) {
@@ -44,10 +49,11 @@ public class ErpOrderServiceImpl implements ErpOrderService {
// reqDTO.setBskey(vo.getOrderNo());
// reqDTO.setUsrid(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
// reqDTO.setUsrnm((SecurityFrameworkUtils.getLoginUserNickname()));
AdminUserRespDTO userRespDTO = getWorkId();
reqDTO.setFuncnr(funcnr);
reqDTO.setBskey(vo.getOrderNo());
reqDTO.setUsrid("100048799");
reqDTO.setUsrnm("夏丽丽");
reqDTO.setUsrid(userRespDTO.getWorkcode());
reqDTO.setUsrnm(userRespDTO.getUsername());
return reqDTO;
}
@@ -80,7 +86,7 @@ public class ErpOrderServiceImpl implements ErpOrderService {
req.put("comp", updateVo.getComps());
reqDTO.setReq(req);
String reqJson = com.alibaba.fastjson2.JSON.toJSONString(reqDTO);
return submitToErp(reqDTO);
}
@@ -102,22 +108,33 @@ public class ErpOrderServiceImpl implements ErpOrderService {
private ErpSubmitReqDTO buildBaseReqDTO062(ErpOrderUpdateReqVO vo, String funcnr) {
ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
// reqDTO.setFuncnr(funcnr);
// reqDTO.setBskey(vo.getPoNumber());
// reqDTO.setUsrid(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
// reqDTO.setUsrnm((SecurityFrameworkUtils.getLoginUserNickname()));
AdminUserRespDTO userRespDTO = getWorkId();
reqDTO.setFuncnr(funcnr);
reqDTO.setBskey(vo.getPoNumber());
reqDTO.setUsrid(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
reqDTO.setUsrnm((SecurityFrameworkUtils.getLoginUserNickname()));
reqDTO.setUsrid(userRespDTO.getWorkcode());
reqDTO.setUsrnm(userRespDTO.getUsername());
return reqDTO;
}
ErpSubmitReqDTO buildBaseReqDTO091(ErpSalesOrderSaveReqVO vo, String funcnr){
AdminUserRespDTO userRespDTO = getWorkId();
ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
reqDTO.setFuncnr(funcnr);
reqDTO.setBskey(vo.getOrderNo());
reqDTO.setUsrid("100048799");
reqDTO.setUsrnm("夏丽丽");
reqDTO.setUsrid(userRespDTO.getWorkcode());
reqDTO.setUsrnm(userRespDTO.getUsername());
// reqDTO.setBskey(vo.getOrderNo());
// reqDTO.setUsrid(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
// reqDTO.setUsrnm((SecurityFrameworkUtils.getLoginUserNickname()));
return reqDTO;
}
private AdminUserRespDTO getWorkId(){
CommonResult<AdminUserRespDTO> user = adminUserApi.getUser(SecurityFrameworkUtils.getLoginUserId());
return user.getData();
}
}