1

Reportapi/Documents/生产环境.config

@@ -143,7 +143,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />

Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs

@@ -195,5 +195,12 @@ namespace MyCode.Project.Domain.Model
            /// </summary>           
            public Guid? JackOrdersId {get;set;}
 
+           /// <summary>
+           /// Desc:计量单位
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string Unit {get;set;}
+
     }
 }

Reportapi/MyCode.Project.Domain/Model/PushKingDeeOrderItem.cs

@@ -78,5 +78,12 @@ namespace MyCode.Project.Domain.Model
            /// </summary>           
            public Guid? PushKingDeeOrderId {get;set;}
 
+           /// <summary>
+           /// Desc:计量单位
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string Unit {get;set;}
+
     }
 }

Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs

@@ -11,8 +11,7 @@ namespace MyCode.Project.Domain.Model
     [SugarTable("YTKJ_t_ShopParameter")]
     public partial class YTKJTShopParameter
     {
-        public YTKJTShopParameter()
+           public YTKJTShopParameter(){
-        {
 
 
            }
@@ -199,12 +198,12 @@ namespace MyCode.Project.Domain.Model
            public long? FSALER {get;set;}
 
            /// <summary>
-        /// Desc:销售员ID
+           /// Desc:销售组织ID
            /// Default:
            /// Nullable:True
            /// </summary>           
            [SugarColumn(ColumnName="F_SALE_ORGID")]
-        public int? FSaleOrgId { get; set; }
+           public int? FSALEORGID {get;set;}
 
     }
 }

Reportapi/MyCode.Project.Services/IServices/IJackYunStockinService.cs

@@ -14,18 +14,18 @@ namespace MyCode.Project.Services
         /// </summary>
         /// <param name="now"></param>
         /// <returns></returns>
-        void TaskSendInventoryMovement(DateTime now);
+        void TaskSendInventoryMovement(string sheet);
 
         /// <summary>
         /// 推送入库申请
         /// </summary>
         /// <param name="now"></param>
-        void SendInStock(DateTime now);
+        void SendInStock(string sheet);
 
         /// <summary>
         /// 推送出库申请
         /// </summary>
         /// <param name="now"></param>
-        void SendOutStock(DateTime now);
+        void SendOutStock(string sheet);
     }
 }

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

@@ -2,6 +2,7 @@
 using MyCode.Project.Domain.Repositories;
 using MyCode.Project.Infrastructure.Common;
 using MyCode.Project.Infrastructure.Enumeration;
+using MyCode.Project.Infrastructure.Exceptions;
 using MyCode.Project.Infrastructure.JackYun;
 using System;
 using System.Collections.Generic;
@@ -43,21 +44,21 @@ namespace MyCode.Project.Services.Implementation
             return JsonHelper.ToObject<JackyunResponse>(strResponse);
         }
 
-        public void TaskSendInventoryMovement(DateTime now)
+        public void TaskSendInventoryMovement(string sheet)
         {
-            SendInStock(now);
+            SendInStock(sheet);
 
-            SendOutStock(now);
+            SendOutStock(sheet);
         }
 
         /// <summary>
         /// 上传入库数据
         /// </summary>
-        public void SendInStock(DateTime now)
+        public void SendInStock(string sheet)
         {
             var list = _wMStoJackyunInventoryMovementView1Repository.GetInventoryMovement();
             //过滤入库数据
-            var InStockHead = list.Where(t => t.type == "+").Select(p => p.relDataId).Distinct().ToList();
+            var InStockHead = list.Where(t => t.type == "+" && t.relDataId == sheet).Select(p => p.relDataId).Distinct().ToList();
             InStockHead.ForEach(relDataId =>
             {
                 CreateAndStockinGetRequestBizData requestBizData = new CreateAndStockinGetRequestBizData();
@@ -87,6 +88,8 @@ namespace MyCode.Project.Services.Implementation
                 LogHelper.Info("上传入库数据报文:"+lggl);
                 Thread.Sleep(500);
                 JackyunResponse response = Call(EnumAttribute.GetAttribute(ApiEnum.CREATEANDSTOCKIN).Value, "1.0", requestBizData);
+                string ll = JsonHelper.ToJson(response);
+                LogHelper.Info("上传入库数据结果:" + ll);
                 //判断返回结果是否成功
                 if (response.code == "200")
                 {
@@ -94,21 +97,23 @@ namespace MyCode.Project.Services.Implementation
                 }
                 else
                 {
-                    _wMStoJackyunInventoryMovementView1Repository.UpdateStatus(3, relDataId);
+                    //_wMStoJackyunInventoryMovementView1Repository.UpdateStatus(3, relDataId);
+                    string msg = response.msg;
+                    throw new BaseException(msg);
+
                 }
-                string ll = JsonHelper.ToJson(response);          
+              
-                LogHelper.Info("上传入库数据结果:"+ll);
             });
         }
 
         /// <summary>
         /// 上传出库数据
         /// </summary>
-        public void SendOutStock(DateTime now)
+        public void SendOutStock(string sheet)
         {
             var list = _wMStoJackyunInventoryMovementView1Repository.GetInventoryMovement();
             //过滤出库数据
-            var OutStockHead = list.Where(t => t.type != "+").Select(p => p.relDataId).Distinct().ToList();
+            var OutStockHead = list.Where(t => t.type != "+" && t.relDataId==sheet).Select(p => p.relDataId).Distinct().ToList(); 
             OutStockHead.ForEach(relDataId =>
             {
                 
@@ -139,6 +144,8 @@ namespace MyCode.Project.Services.Implementation
                 LogHelper.Info(lggl);
                 Thread.Sleep(500);
                 JackyunResponse response = Call(EnumAttribute.GetAttribute(ApiEnum.CREATEANDSTOCKOUT).Value, "1.0", requestBizData);
+                string ll = JsonHelper.ToJson(response);
+                LogHelper.Info(ll);
                 //判断返回结果是否成功
                 if (response.code == "200")
                 {                    
@@ -146,11 +153,14 @@ namespace MyCode.Project.Services.Implementation
                 }
                 else
                 {
-                    _wMStoJackyunInventoryMovementView1Repository.UpdateStatus(3, relDataId);
+                    string msg = response.msg;
+                    throw new BaseException(msg);
+                    //_wMStoJackyunInventoryMovementView1Repository.UpdateStatus(3, relDataId);
                 }
-                string ll = JsonHelper.ToJson(response);
+               
-                LogHelper.Info(ll);
             });
         }
+
+       
     }
 }

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

@@ -300,8 +300,7 @@ namespace MyCode.Project.Services.Implementation
                 FDate = pushKingdeeOrder.ConsignTime?.ToString("yyyy/MM/dd"),
                 FSaleOrgId = new FSaleOrgId()
                 {
-                    //FOrgId = param.FCOMPANYID // 销售组织
+                    FOrgId = param.FSALEORGID.ToString() // 销售组织
-                    FOrgId = param.FSaleOrgId.ToString() // 销售组织
                 },
                 FCustId = new FCustomerId()
                 {

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

@@ -103,13 +103,20 @@ namespace MyCode.Project.Services.Implementation
             if (trades.Count > 0)
             {
                 _repository.Add<WMStoJackyunInventoryMovementView1>(trades);
-
-            }
                 string now = DateTime.Now.ToString();
-            _workProcessService.Add<IJackYunStockinService>(this.MerchantId, "SendInStock", "上传WMS的入库数据到吉客云", now, 1);
+                List<string> inSheet = trades.Where(t => t.变动方向 == "+").Select(t => t.单据号).Distinct().ToList();
+                inSheet.ForEach(t =>
+                {
+                    _workProcessService.Add<IJackYunStockinService>(this.MerchantId, "SendInStock", "上传WMS的入库数据到吉客云", t, 1);
                     Thread.Sleep(500);
-            _workProcessService.Add<IJackYunStockinService>(this.MerchantId, "SendOutStock", "上传WMS的出库数据到吉客云", now, 1);
+                });
-
+                inSheet = trades.Where(t => t.变动方向 != "+").Select(t => t.单据号).Distinct().ToList();
+                inSheet.ForEach(t =>
+                {
+                    _workProcessService.Add<IJackYunStockinService>(this.MerchantId, "SendOutStock", "上传WMS的出库数据到吉客云", t, 1);
+                    Thread.Sleep(500);
+                });
+            }
         }
         #endregion
 
@@ -121,7 +128,6 @@ namespace MyCode.Project.Services.Implementation
         {
             string now = DateTime.Now.ToString();
             _workProcessService.Add<IJackYunTaskService>(this.MerchantId, "GetAndMergeJackYunOrder", "合并吉客云订单到新表", now, 1);           
-           
         }
         #endregion
     }

Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs

@@ -189,9 +189,9 @@ namespace MyCode.Project.WebApi.Controllers
         /// </summary>
         [HttpGet]
         [AllowAnonymous]
-        public void TaskSendJackYunInOrOutStock()
+        public void TaskSendJackYunInOrOutStock(string sheet)
         {
-            _jackYunStockinService.TaskSendInventoryMovement(DateTime.Now);
+            _jackYunStockinService.TaskSendInventoryMovement( sheet);
         }
         #endregion
     }