Merge branch 'jackYun' of http://8.130.121.29:3000/yuyubo/YunTongJackYunTask into jackYun

Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs

@@ -213,13 +213,13 @@ namespace MyCode.Project.Services.Implementation
             // 新建销售订单实例
             var order = new SaleOrder();
             // 赋值
-            var orderNo = DateTimeOffset.Now.ToUnixTimeSeconds().ToString();
+            var orderNo = pushKingdeeOrder.Sheet.ToString();
+            //var orderNo = DateTimeOffset.Now.ToUnixTimeSeconds().ToString();
 
             order.CreateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             order.OrderTime = pushKingdeeOrder.CreateTime?.ToString("yyyy-MM-dd HH:mm:ss");
             order.OrderNo = orderNo;
-            //order.CompanyId = param.FCOMPANYID; // 公司Id
+            order.CompanyId = param.FCOMPANYID; // 公司Id
-            order.CompanyId = "TZ"; // 公司Id
             order.OrderType = pushKingdeeOrder.TradeType == 8 ? "PFTH" : "PFDD"; // 订单类型
             order.CustomerId = param.FCANGKUHUOZHU; // 货主ID
             order.WarehouseId = pushKingdeeOrder?.WarehouseId;
@@ -234,7 +234,7 @@ namespace MyCode.Project.Services.Implementation
             {
                 OrderNo = orderNo,
                 //CompanyId = param.FCOMPANYID, // 公司Id
-                CompanyId = "TZ", // 公司Id
+                CompanyId = param.FCOMPANYID, // 公司Id
                 OrderType = pushKingdeeOrder.TradeType == 8 ? "7" : "4", // 订单类型
                 LineNo = itemList.IndexOf(n) + 1,
                 CustomerId = param.FCANGKUHUOZHU, // 货主ID
@@ -245,7 +245,7 @@ namespace MyCode.Project.Services.Implementation
                 ItemId = n.GoodsNo, // 商品
                 LocationId = param.FWAREHOUSECODE,
                 CreateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
-                OrderUnit = "pcs"
+                OrderUnit = n.Unit,
             }).ToArray();
 
             var uri = "http://172.16.42.45:9000";