Merge remote-tracking branch 'origin/dev_1.0.2' into dev_1.0.2

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

@@ -631,12 +631,12 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
         // 采购员：userName=徐心钰
         SysUser user = userMapper.selectUserByLoginName(nexPurchaserUsername);
         if(user == null){
-            user = userMapper.selectUserById(103L);
+            user = userMapper.selectUserById(nexOwnerId);
         }
         omsPurchaseOrder.setPurchaserId(user.getUserId());
         omsPurchaseOrder.setPurchaserName(user.getUserName());
-        omsPurchaseOrder.setPurchaserMobile("");
+        omsPurchaseOrder.setPurchaserMobile(user.getPhonenumber());
-        omsPurchaseOrder.setPurchaserEmail("");
+        omsPurchaseOrder.setPurchaserEmail(user.getEmail());
         // 入库仓id
         omsPurchaseOrder.setWarehouseId(nexWarehouseId);
         omsPurchaseOrder.setPayMethod(nexPayMethod);
@@ -645,12 +645,15 @@ 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编码查询产品信息，折扣，单价和税率都从产品信息读