Compare commits

..

No commits in common. "c27bfd26cf3cc751c3e1803d3bc92324b1836a0e" and "802b169818f1dca3446540bde899dbfe2d1f56c0" have entirely different histories.

1 changed files with 3 additions and 6 deletions

View File

@ -631,12 +631,12 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
// 采购员userName=徐心钰
SysUser user = userMapper.selectUserByLoginName(nexPurchaserUsername);
if(user == null){
user = userMapper.selectUserById(nexOwnerId);
user = userMapper.selectUserById(103L);
}
omsPurchaseOrder.setPurchaserId(user.getUserId());
omsPurchaseOrder.setPurchaserName(user.getUserName());
omsPurchaseOrder.setPurchaserMobile(user.getPhonenumber());
omsPurchaseOrder.setPurchaserEmail(user.getEmail());
omsPurchaseOrder.setPurchaserMobile("");
omsPurchaseOrder.setPurchaserEmail("");
// 入库仓id
omsPurchaseOrder.setWarehouseId(nexWarehouseId);
omsPurchaseOrder.setPayMethod(nexPayMethod);
@ -645,15 +645,12 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
// omsPurchaseOrder.setTotalAmount(new BigDecimal(nexTotalAmount));
omsPurchaseOrder.setStatus(OmsPurchaseOrder.StatusEnum.WAIT_COMPLETED.getCode()); // 0
omsPurchaseOrder.setApproveStatus(ApproveStatusEnum.WAIT_COMMIT.getCode()); // 0
omsPurchaseOrder.setPurchaseDate(new Date());
// 创建采购订单明细项
OmsPurchaseOrderItem orderItem = new OmsPurchaseOrderItem();
orderItem.setProductType(addToNexReq.getProductType());
orderItem.setProductCode(addToNexReq.getProductCode());
orderItem.setQuantity(new BigDecimal(addToNexReq.getQuantity()));
// 交货日期
orderItem.setDeliveryDate(new Date());
// 根据BOM编码查询产品信息折扣单价和税率都从产品信息读