推送销售出库单

Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/PurchaseStockInModel.cs

@@ -37,6 +37,7 @@ namespace MyCode.Project.Domain.Message.Request.KingDee.SaveModel
 
     public class FOwnerIdHead
     {
+        public string FOrgId { get; set; }
         public string FNumber { get; set; }
     }
 

Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/SaleOrderModel.cs

@@ -554,6 +554,8 @@ namespace MyCode.Project.Domain.Message.Request.KingDee.SaveModel
 
     public class FStockOrgId
     {
+
+        public string FOrgId { get; set; }
         /// <summary>
         /// 
         /// </summary>

Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/SalesOutboundModel.cs

@@ -1,4 +1,6 @@
+using Newtonsoft.Json;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 
 namespace MyCode.Project.Domain.Message.Request.KingDee.SaveModel
@@ -45,6 +47,7 @@ namespace MyCode.Project.Domain.Message.Request.KingDee.SaveModel
 
     public class FSettleOrgID
     {
+        public string FOrgId { get; set; }
         public string FNumber { get; set; }
     }
 
@@ -58,7 +61,7 @@ namespace MyCode.Project.Domain.Message.Request.KingDee.SaveModel
         public string FNumber { get; set; }
     }
 
-    public class FSalesOutboundEntryItem
+    public class FSalesOutboundEntryItemOld
     {
         public string FRowType { get; set; }
         public FMaterialID FMaterialID { get; set; }
@@ -104,6 +107,231 @@ namespace MyCode.Project.Domain.Message.Request.KingDee.SaveModel
         public bool? FVmiBusinessStatus { get; set; }
     }
 
+
+    /// <summary>
+    /// <20><><EFBFBD>۳<EFBFBD><DBB3>ⵥ<EFBFBD><E2B5A5>ϸ<EFBFBD><CFB8>ʵ<EFBFBD><CAB5><EFBFBD><EFBFBD>
+    /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>۳<EFBFBD><DBB3><EFBFBD>ҵ<EFBFBD><D2B5><EFBFBD>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϸ<EFBFBD><CFB8>Ϣ
+    /// </summary>
+    public class FSalesOutboundEntryItem
+    {
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD>
+        /// </summary>
+
+        public string Fcode { get; set; }
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        public string FRowType { get; set; }
+
+        /// <summary>
+        /// <20><><EFBFBD>ϱ<EFBFBD>ʶ
+        /// </summary>
+        public FMaterialID FMaterialID { get; set; }
+
+        /// <summary>
+        /// <20><>λ<EFBFBD><CEBB>ʶ
+        /// </summary>
+        public FUnitID FUnitID { get; set; }
+
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        public decimal? FInventoryQty { get; set; }
+
+        /// <summary>
+        /// ʵ<>ʳ<EFBFBD><CAB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        public decimal? FRealQty { get; set; }
+
+        /// <summary>
+        /// <20>Ƽ<EFBFBD><C6BC><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        public decimal? FDisPriceQty { get; set; }
+
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD>
+        /// </summary>
+        public decimal? FPrice { get; set; }
+
+        /// <summary>
+        /// <20><>˰<EFBFBD><CBB0><EFBFBD><EFBFBD>
+        /// </summary>
+        public decimal? FTaxPrice { get; set; }
+
+        /// <summary>
+        /// <20>Ƿ<EFBFBD><C7B7><EFBFBD>Ʒ
+        /// </summary>
+        public bool? FIsFree { get; set; }
+
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͱ<EFBFBD>ʶ
+        /// </summary>
+        public string FOwnerTypeID { get; set; }
+
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʶ
+        /// </summary>
+        public FOwnerID FOwnerID { get; set; }
+
+        /// <summary>
+        /// <20><>˰<EFBFBD><CBB0>
+        /// </summary>
+        public decimal? FEntryTaxRate { get; set; }
+
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><CEBB><EFBFBD><EFBFBD>
+        /// </summary>
+        public decimal? FAuxUnitQty { get; set; }
+
+        /// <summary>
+        /// <20>ⲿ<EFBFBD><E2B2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><CEBB><EFBFBD><EFBFBD>
+        /// </summary>
+        public decimal? FExtAuxUnitQty { get; set; }
+
+        public FStockID FStockID { get; set; }
+        /// <summary>
+        /// Դ<><D4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        public string FSrcType { get; set; }
+
+        /// <summary>
+        /// Դ<><D4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        public string FSrcBillNo { get; set; }
+
+        /// <summary>
+        /// <20>ۿ<EFBFBD><DBBF><EFBFBD>
+        /// </summary>
+        public decimal? FDiscountRate { get; set; }
+
+        /// <summary>
+        /// <20>۸<EFBFBD><DBB8>ۿ<EFBFBD>
+        /// </summary>
+        public decimal? FPriceDiscount { get; set; }
+
+        /// <summary>
+        /// ʵ<><CAB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        public decimal? FActQty { get; set; }
+
+        /// <summary>
+        /// <20><><EFBFBD>۵<EFBFBD>λ<EFBFBD><CEBB>ʶ
+        /// </summary>
+        public FSalUnitID FSalUnitID { get; set; }
+
+        /// <summary>
+        /// <20><><EFBFBD>۵<EFBFBD>λ<EFBFBD><CEBB><EFBFBD><EFBFBD>
+        /// </summary>
+        public decimal? FSALUNITQTY { get; set; }
+
+        /// <summary>
+        /// <20><><EFBFBD>ۻ<EFBFBD><DBBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        public decimal? FSALBASEQTY { get; set; }
+
+        /// <summary>
+        /// <20>۸<EFBFBD><DBB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        public decimal? FPRICEBASEQTY { get; set; }
+
+        /// <summary>
+        /// <20>Ƿ񳬷<C7B7><F1B3ACB7><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        public bool? FOUTCONTROL { get; set; }
+
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        public decimal? FRepairQty { get; set; }
+
+        /// <summary>
+        /// <20>Ƿ<EFBFBD><C7B7>編<EFBFBD><E7B7A8><EFBFBD><EFBFBD>֯
+        /// </summary>
+        public bool? FIsOverLegalOrg { get; set; }
+
+        /// <summary>
+        /// δ<><CEB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        public decimal? FARNOTJOINQTY { get; set; }
+
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼ID
+        /// </summary>
+        public int? FQmEntryID { get; set; }
+
+        /// <summary>
+        /// ת<><D7AA><EFBFBD><EFBFBD>¼ID
+        /// </summary>
+        public int? FConvertEntryID { get; set; }
+
+        /// <summary>
+        /// <20><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD><EFBFBD><EFBFBD>¼ID
+        /// </summary>
+        public int? FSOEntryId { get; set; }
+
+        /// <summary>
+        /// <20>ۿ<EFBFBD>ǰ<EFBFBD>Ƽ<EFBFBD><C6BC><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        public decimal? FBeforeDisPriceQty { get; set; }
+
+        /// <summary>
+        /// ǩ<><C7A9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        public decimal? FSignQty { get; set; }
+
+        /// <summary>
+        /// <20>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD>齻<EFBFBD><E9BDBB>
+        /// </summary>
+        public bool? FCheckDelivery { get; set; }
+
+        /// <summary>
+        /// <20>ۿ<EFBFBD>ǰ<EFBFBD>ܽ<EFBFBD><DCBD><EFBFBD>
+        /// </summary>
+        public decimal? FAllAmountExceptDisCount { get; set; }
+
+        /// <summary>
+        /// <20>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD>֯<EFBFBD><D6AF><EFBFBD><EFBFBD>
+        /// </summary>
+        public bool? FSettleBySon { get; set; }
+
+        /// <summary>
+        /// BOM<4F><4D>¼ID
+        /// </summary>
+        public int? FBOMEntryId { get; set; }
+
+        /// <summary>
+        /// <20>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֶ<EFBFBD>
+        /// </summary>
+        public decimal? F_dmi_Amount { get; set; }
+
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD>ʶ
+        /// </summary>
+        public FMaterialID_Sal FMaterialID_Sal { get; set; }
+
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼ID
+        /// </summary>
+        public int? FInStockEntryId { get; set; }
+
+        /// <summary>
+        /// <20>տ<EFBFBD><D5BF><EFBFBD>¼ID
+        /// </summary>
+        public int? FReceiveEntryId { get; set; }
+
+        /// <summary>
+        /// <20>Ƿ<EFBFBD><C7B7>滻<EFBFBD><E6BBBB><EFBFBD><EFBFBD>
+        /// </summary>
+        public bool? FIsReplaceOut { get; set; }
+
+        /// <summary>
+        /// VMIҵ<49><D2B5>״̬
+        /// </summary>
+        public bool? FVmiBusinessStatus { get; set; }
+    }
+ 
+
     public class FMaterialID
     {
         public string FNumber { get; set; }
@@ -111,6 +339,7 @@ namespace MyCode.Project.Domain.Message.Request.KingDee.SaveModel
 
     public class FOwnerID
     {
+        public string FOrgId { get; set; }
         public string FNumber { get; set; }
     }
 
@@ -127,6 +356,11 @@ namespace MyCode.Project.Domain.Message.Request.KingDee.SaveModel
     public class FCustomerID
     {
         public string FNumber { get; set; }
+
+        /// <summary>
+        /// <20>ͻ<EFBFBD>ID
+        /// </summary>
+        public string FCustId { get; set; }
     }
 
     public class FSaleDeptID
@@ -153,5 +387,12 @@ namespace MyCode.Project.Domain.Message.Request.KingDee.SaveModel
     {
         public string FNumber { get; set; }
     }
+
+
+    public class FStockID
+    {
+        public string FstockId { get; set; }
+        public string FNumber { get; set; }
+    }
 }
 

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

@@ -25,7 +25,7 @@ namespace MyCode.Project.Services.Implementation
         private const string EXCHANGE_TYPE = "HLTX01_SYS";
         private const string DEFAULT_ORG = "100";
         private const string DEFAULT_CURRENCY = "PRE001";
-        private const string DEFAULT_UNIT = "Pcs";
+        private const string DEFAULT_UNIT = "包";
         private const string ROW_TYPE_STANDARD = "Standard";
         private const string ROW_TYPE_SERVICE = "Service";
         private const string FORM_ID = "SAL_OUTSTOCK";
@@ -65,7 +65,7 @@ namespace MyCode.Project.Services.Implementation
                 throw new BaseException($"未找到ID为 {id} 的销售出库单记录");
             }
 
-            if (orderHead.Status != 0)
+            if (orderHead.Status == 2)
             {
                 throw new BaseException($"销售出库单 {orderHead.Sheet} 已经推送过，状态为：{orderHead.Status}，不允许重复推送");
             }
@@ -129,10 +129,11 @@ namespace MyCode.Project.Services.Implementation
 
             // 获取销售组织ID
             string orgId = param.FSALEORGID?.ToString() ?? DEFAULT_ORG;
-            
+           
-            // 获取仓库编码
-            string warehouseCode = orderHead.WarehouseCode ?? param.FWAREHOUSECODE ?? "";
 
+            // 获取仓库编码
+            //string warehouseCode = orderHead.WarehouseCode ?? param.FWAREHOUSECODE ?? "";
+            string warehouseCode = param.FWAREHOUSECODE ;
             // 数据校验
             if (string.IsNullOrEmpty(warehouseCode))
             {
@@ -154,7 +155,7 @@ namespace MyCode.Project.Services.Implementation
             BillSave billSave = new BillSave()
             {
                 Model = model,
-                IsAutoSubmitAndAudit = true,
+                IsAutoSubmitAndAudit = false,
             };
 
             // 调用金蝶服务保存单据
@@ -184,15 +185,16 @@ namespace MyCode.Project.Services.Implementation
 
             return new FSalesOutboundEntryItem()
             {
+                Fcode= item.Barcode ?? "",
                 FRowType = rowType,
-                FMaterialID = new FMaterialID()
+                //FMaterialID = new FMaterialID()
-                {
+                //{
-                    FNumber = item.Barcode ?? ""
+                //    FNumber = item.Barcode ?? ""
-                },
+                //},
-                FUnitID = new FUnitID()
+                //FUnitID = new FUnitID()
-                {
+                //{
-                    FNumber = item.Unit ?? DEFAULT_UNIT
+                //    FNumber = item.Unit ?? DEFAULT_UNIT
-                },
+                //},
                 FInventoryQty = 0,
                 FRealQty = realQty,
                 FDisPriceQty = 0,
@@ -202,7 +204,11 @@ namespace MyCode.Project.Services.Implementation
                 FOwnerTypeID = OWNER_TYPE,
                 FOwnerID = new FOwnerID()
                 {
-                    FNumber = orgId
+                    FOrgId = orgId
+                },
+                FStockID=new FStockID()
+                {
+                    FNumber = param.FWAREHOUSECODE
                 },
                 FEntryTaxRate = param.FTAXRATE,
                 FAuxUnitQty = 0,
@@ -264,16 +270,16 @@ namespace MyCode.Project.Services.Implementation
                 FDate = dateStr,
                 FSaleOrgId = new FSaleOrgId()
                 {
-                    FNumber = orgId
+                    FOrgId = orgId
                 },
                 FCustomerID = new FCustomerID()
                 {
-                    FNumber = customerId
+                    FCustId = customerId
-                },
-                FSaleDeptID = new FSaleDeptID()
-                {
-                    FNumber = "02"
                 },
+                //FSaleDeptID = new FSaleDeptID()
+                //{
+                //    FNumber = "02"
+                //},
                 FReceiverID = new FReceiverID()
                 {
                     FNumber = customerId
@@ -284,7 +290,7 @@ namespace MyCode.Project.Services.Implementation
                 },
                 FStockOrgId = new FStockOrgId()
                 {
-                    FNumber = orgId
+                    FOrgId = orgId
                 },
                 FSettleID = new FSettleID()
                 {
@@ -295,13 +301,14 @@ namespace MyCode.Project.Services.Implementation
                     FNumber = customerId
                 },
                 FOwnerTypeIdHead = OWNER_TYPE,
+                
                 FOwnerIdHead = new FOwnerIdHead()
                 {
-                    FNumber = orgId
+                    FOrgId = orgId
                 },
                 FCDateOffsetValue = 0,
                 FIsTotalServiceOrCost = false,
-                F_dmi_Combo = "标准出库",
+                //F_dmi_Combo = "标准出库",
                 SubHeadEntity = new FSubHeadEntity()
                 {
                     FSettleCurrID = new FSettleCurrID()
@@ -310,7 +317,7 @@ namespace MyCode.Project.Services.Implementation
                     },
                     FSettleOrgID = new FSettleOrgID()
                     {
-                        FNumber = orgId
+                        FOrgId = orgId
                     },
                     FIsIncludedTax = false,
                     FLocalCurrID = new FLocalCurrID()
@@ -327,7 +334,7 @@ namespace MyCode.Project.Services.Implementation
                 },
                 FEntity = entryList
             };
-        }
+        } 
     }
 }
 

Reportapi/MyCode.Project.WebApi/Web.config

@@ -49,7 +49,7 @@
     <!-- 组织编码，启用多组织时配置对应的组织编码才有效  -->
     <!--<add key="X-KDApi-OrgNum" value="*****"/>-->
     <!-- 服务Url地址(私有云和公有云都须配置金蝶云星空产品地址，K3Cloud/结尾)-->
-    <add key="X-KDApi-ServerUrl" value="http://127.0.0.1/k3Cloud/" />
+    <add key="X-KDApi-ServerUrl" value="https://k3.yygsbb.com/k3Cloud/" />
     <!--解决swagger出错问题-->
     <add key="aspnet:UseHostHeaderForRequestUrl" value="true" />
     <!--当前环境,1:生产环境 0：开发环境-->