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

Compare commits

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

No commits in common. "c246975914d93d164421a5a13b9813203f3895a9" and "5fb2faecdc5a228fff00bce2dbf8e6fabed4d8be" have entirely different histories.
c246975914 ... 5fb2faecdc

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