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 daa12e6f..a3222a94 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 @@ -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; /** * 查询采购单主表 * @@ -639,8 +639,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));