From 2373b13fc665b76718b832dc6f9633266d1bc15d Mon Sep 17 00:00:00 2001 From: wangy Date: Fri, 20 Mar 2026 16:21:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(sip)=EF=BC=9A=E8=AE=A2=E5=8D=95=E5=90=88?= =?UTF-8?q?=E5=90=8C=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E7=BB=8F=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OmsPurchaseOrderServiceImpl.java | 36 +++++++++++++++---- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java index d32bd5b7..a3e8859e 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java @@ -33,6 +33,7 @@ import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.Task; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import com.ruoyi.common.utils.StringUtils; @@ -79,6 +80,27 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To protected ManagementService managementService; @Autowired 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.setRemark("nex授权申请流程"); // 查询制造商id, 制造商编码P008 - VendorInfo vendorInfo = vendorInfoMapper.selectVendorInfoByVendorCode("P002"); + VendorInfo vendorInfo = vendorInfoMapper.selectVendorInfoByVendorCode(nexVendorCode); omsPurchaseOrder.setVendorId(vendorInfo == null ? null :vendorInfo.getVendorId()); omsPurchaseOrder.setCurrency("RMB"); // 采购员:userName=徐心钰 - SysUser user = userMapper.selectUserByLoginName("xuxinyu"); + SysUser user = userMapper.selectUserByLoginName(nexPurchaserUsername); if(user == null){ user = userMapper.selectUserById(1L); } @@ -602,11 +624,11 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To omsPurchaseOrder.setPurchaserMobile(""); omsPurchaseOrder.setPurchaserEmail(""); // 入库仓id - omsPurchaseOrder.setWarehouseId(3L); - omsPurchaseOrder.setPayMethod("1"); - omsPurchaseOrder.setOwnerId(102L); - omsPurchaseOrder.setOwnerName("叶宇豪"); - omsPurchaseOrder.setTotalAmount(new BigDecimal("1000")); + omsPurchaseOrder.setWarehouseId(nexWarehouseId); + omsPurchaseOrder.setPayMethod(nexPayMethod); + omsPurchaseOrder.setOwnerId(nexOwnerId); + omsPurchaseOrder.setOwnerName(nexOwnerName); + omsPurchaseOrder.setTotalAmount(new BigDecimal(nexTotalAmount)); omsPurchaseOrder.setStatus(OmsPurchaseOrder.StatusEnum.WAIT_COMPLETED.getCode()); // 0 omsPurchaseOrder.setApproveStatus(ApproveStatusEnum.WAIT_COMMIT.getCode()); // 0