mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: mula:5fb2faecdc5a228fff00bce2dbf8e6fabed4d8be
Branches Tags
mula:dev_1.0.2
mula:dev_1.0.1
mula:dev_1.0.0
mula:master
...
compare: mula:c246975914d93d164421a5a13b9813203f3895a9
Branches Tags
mula:dev_1.0.2
mula:dev_1.0.1
mula:dev_1.0.0
mula:master

2 Commits
5fb2faecdc ... c246975914

Author SHA1 Message Date
wangy c246975914 Merge remote-tracking branch 'origin/dev_1.0.2' into dev_1.0.2 2026-06-03 18:15:52 +08:00
wangy 8c2ecc89c8 feat(sip):bug修改，修改配置 2026-06-03 18:14:38 +08:00
1 changed files with 11 additions and 11 deletions
Show Stats Expand all files Collapse all files

22
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java
View File

@ -93,15 +93,15 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
@Value("${sip.nex.owner-name:徐心钰}")
private String nexOwnerName;
// 12,汇智虚拟仓
@Value("${sip.nex.warehouse-id:12}")
private Long nexWarehouseId;
@Value("${sip.nex.pay-method:1}")
private String nexPayMethod;
@Value("${sip.nex.total-amount:1000}")
private String nexTotalAmount;
// // 12,汇智虚拟仓
// @Value("${sip.nex.warehouse-id:12}")
// private Long nexWarehouseId;
//
// @Value("${sip.nex.pay-method:1}")
// private String nexPayMethod;
//
// @Value("${sip.nex.total-amount:1000}")
// private String nexTotalAmount;
/**
* 查询采购单主表
*
@ -669,8 +669,8 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
omsPurchaseOrder.setPurchaserMobile(user.getPhonenumber());
omsPurchaseOrder.setPurchaserEmail(user.getEmail());
// 入库仓id
omsPurchaseOrder.setWarehouseId(nexWarehouseId);
omsPurchaseOrder.setPayMethod(nexPayMethod);
omsPurchaseOrder.setWarehouseId(Long.valueOf(vendorInfo.getWarehouseId()));
omsPurchaseOrder.setPayMethod(String.valueOf(vendorInfo.getPayType()));
omsPurchaseOrder.setOwnerId(nexOwnerId);
omsPurchaseOrder.setOwnerName(nexOwnerName);
// omsPurchaseOrder.setTotalAmount(new BigDecimal(nexTotalAmount));