feat(sip):订单合同修改新增产品经理

dev_1.0.2^2
wangy 2026-03-20 16:21:04 +08:00
parent 4cc420799e
commit 2373b13fc6
1 changed files with 29 additions and 7 deletions

View File

@ -33,6 +33,7 @@ import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.Task; import org.flowable.task.api.Task;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
@ -79,6 +80,27 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
protected ManagementService managementService; protected ManagementService managementService;
@Autowired @Autowired
private IOmsFileLogService omsFileLogService; private IOmsFileLogService omsFileLogService;
@Value("${sip.nex.vendor-code:P100}")
private String nexVendorCode;
@Value("${sip.nex.purchaser-username:xuxinyu}")
private String nexPurchaserUsername;
@Value("${sip.nex.owner-id:102}")
private Long nexOwnerId;
@Value("${sip.nex.owner-name:叶宇豪}")
private String nexOwnerName;
@Value("${sip.nex.warehouse-id:3}")
private Long nexWarehouseId;
@Value("${sip.nex.pay-method:1}")
private String nexPayMethod;
@Value("${sip.nex.total-amount:1000}")
private String nexTotalAmount;
/** /**
* *
* *
@ -589,11 +611,11 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
omsPurchaseOrder.setBuyerAddress("重庆市两江新区云杉南路6号涉外商务区B6栋7楼"); omsPurchaseOrder.setBuyerAddress("重庆市两江新区云杉南路6号涉外商务区B6栋7楼");
omsPurchaseOrder.setRemark("nex授权申请流程"); omsPurchaseOrder.setRemark("nex授权申请流程");
// 查询制造商id, 制造商编码P008 // 查询制造商id, 制造商编码P008
VendorInfo vendorInfo = vendorInfoMapper.selectVendorInfoByVendorCode("P002"); VendorInfo vendorInfo = vendorInfoMapper.selectVendorInfoByVendorCode(nexVendorCode);
omsPurchaseOrder.setVendorId(vendorInfo == null ? null :vendorInfo.getVendorId()); omsPurchaseOrder.setVendorId(vendorInfo == null ? null :vendorInfo.getVendorId());
omsPurchaseOrder.setCurrency("RMB"); omsPurchaseOrder.setCurrency("RMB");
// 采购员userName=徐心钰 // 采购员userName=徐心钰
SysUser user = userMapper.selectUserByLoginName("xuxinyu"); SysUser user = userMapper.selectUserByLoginName(nexPurchaserUsername);
if(user == null){ if(user == null){
user = userMapper.selectUserById(1L); user = userMapper.selectUserById(1L);
} }
@ -602,11 +624,11 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
omsPurchaseOrder.setPurchaserMobile(""); omsPurchaseOrder.setPurchaserMobile("");
omsPurchaseOrder.setPurchaserEmail(""); omsPurchaseOrder.setPurchaserEmail("");
// 入库仓id // 入库仓id
omsPurchaseOrder.setWarehouseId(3L); omsPurchaseOrder.setWarehouseId(nexWarehouseId);
omsPurchaseOrder.setPayMethod("1"); omsPurchaseOrder.setPayMethod(nexPayMethod);
omsPurchaseOrder.setOwnerId(102L); omsPurchaseOrder.setOwnerId(nexOwnerId);
omsPurchaseOrder.setOwnerName("叶宇豪"); omsPurchaseOrder.setOwnerName(nexOwnerName);
omsPurchaseOrder.setTotalAmount(new BigDecimal("1000")); omsPurchaseOrder.setTotalAmount(new BigDecimal(nexTotalAmount));
omsPurchaseOrder.setStatus(OmsPurchaseOrder.StatusEnum.WAIT_COMPLETED.getCode()); // 0 omsPurchaseOrder.setStatus(OmsPurchaseOrder.StatusEnum.WAIT_COMPLETED.getCode()); // 0
omsPurchaseOrder.setApproveStatus(ApproveStatusEnum.WAIT_COMMIT.getCode()); // 0 omsPurchaseOrder.setApproveStatus(ApproveStatusEnum.WAIT_COMMIT.getCode()); // 0