From 91617757fc0ba5f2dff23806324804a152c7cb64 Mon Sep 17 00:00:00 2001 From: tangj Date: Wed, 26 Nov 2025 17:50:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=91=E8=9D=B6?= =?UTF-8?q?=E4=B8=AD=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95MAP=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E6=97=B6=E5=9B=A0=E4=B8=BA=E4=BB=A3=E7=A0=81=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E4=BB=B7=E6=A0=BC=E4=BF=A1=E6=81=AF=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?,=E4=BF=AE=E5=A4=8D=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/ERPModels/PurchaseOrderBill.cs | 3 +++ SHK3CloudWebAPI/Models/PurchaseOrderData.cs | 1 + SHK3CloudWebAPI/Service/BillQueryService.cs | 5 +++-- SHK3CloudWebAPI/Service/InService.cs | 15 ++++++++++--- SHK3CloudWebAPI/appsettings.json | 21 +++++++++---------- 5 files changed, 29 insertions(+), 16 deletions(-) diff --git a/SHK3CloudWebAPI/Models/ERPModels/PurchaseOrderBill.cs b/SHK3CloudWebAPI/Models/ERPModels/PurchaseOrderBill.cs index add56e4..32c54e2 100644 --- a/SHK3CloudWebAPI/Models/ERPModels/PurchaseOrderBill.cs +++ b/SHK3CloudWebAPI/Models/ERPModels/PurchaseOrderBill.cs @@ -11,5 +11,8 @@ //public int FDetailEntity_FSEQ { get; set; } public string FMaterialIdNumber { get; set; } + + public decimal? FTaxPrice { get; set; } + } } diff --git a/SHK3CloudWebAPI/Models/PurchaseOrderData.cs b/SHK3CloudWebAPI/Models/PurchaseOrderData.cs index 99e540c..a5990a5 100644 --- a/SHK3CloudWebAPI/Models/PurchaseOrderData.cs +++ b/SHK3CloudWebAPI/Models/PurchaseOrderData.cs @@ -122,6 +122,7 @@ namespace SHK3CloudWebAPI.Models /// [XmlElement("qty")] public decimal Qty { get; set; } + /// /// 信用模式：1 现金结算，2 账期结算，3 铺货代销 diff --git a/SHK3CloudWebAPI/Service/BillQueryService.cs b/SHK3CloudWebAPI/Service/BillQueryService.cs index 7317bc1..da607ae 100644 --- a/SHK3CloudWebAPI/Service/BillQueryService.cs +++ b/SHK3CloudWebAPI/Service/BillQueryService.cs @@ -604,7 +604,7 @@ namespace SHK3CloudWebAPI StartRow = 0, FilterString = strJson, OrderString = "", - FieldKeys = "FID,FBillNo,FPOOrderEntry_FEntryId,FMaterialId.FNumber as FMaterialIdNumber" + FieldKeys = "FID,FBillNo,FPOOrderEntry_FEntryId,FMaterialId.FNumber as FMaterialIdNumber,FTAXPRICE AS FTaxPrice" }; string json = JsonConvert.SerializeObject(billQuery); @@ -619,7 +619,8 @@ namespace SHK3CloudWebAPI FID = int.Parse(row[0]), FBillNo = row[1], FDetailEntity_FEntryId = int.Parse(row[2]), - FMaterialIdNumber = row[3] + FMaterialIdNumber = row[3], + FTaxPrice = string.IsNullOrEmpty(row[4]) ? (decimal?)null : decimal.Parse(row[4]) }; resulted.Add(purchaseOrderBill); diff --git a/SHK3CloudWebAPI/Service/InService.cs b/SHK3CloudWebAPI/Service/InService.cs index 5d6a7c8..e99bfbd 100644 --- a/SHK3CloudWebAPI/Service/InService.cs +++ b/SHK3CloudWebAPI/Service/InService.cs @@ -1360,6 +1360,11 @@ namespace SHK3CloudWebAPI //数量 entryRow.Add("FQty", row.Qty); + //含税单价 + entryRow.Add("FTaxPrice", row.PriceWithTax); + + //税率 固定为13% + entryRow.Add("FTAXRATE", "13"); //收货仓库 basedata = new JObject(); @@ -1444,7 +1449,7 @@ namespace SHK3CloudWebAPI string FLog_Txt = CommonHelper.SerializeToXml(parameter); JObject jsonRoot = new JObject(); - jsonRoot.Add("IsAutoSubmitAndAudit", false); //是否自动审核 + jsonRoot.Add("IsAutoSubmitAndAudit", true); //是否自动审核 jsonRoot.Add("IsAutoAdjustField", true); jsonRoot.Add("IsVerifyBaseDataField", true); @@ -1498,8 +1503,7 @@ namespace SHK3CloudWebAPI //数量 entryRow.Add("FActReceiveQty", row.Qty); - - //箱号 + //箱号 entryRow.Add("F_UNW_XiangHao", row.CartonNo); //UPC entryRow.Add("F_UNW_UPC", row.Upc); @@ -1511,6 +1515,11 @@ namespace SHK3CloudWebAPI basedata.Add("FNumber", parameter.InboundOrder.WhCode); entryRow.Add("FStockID", basedata); + //含税单价 , 从源单(采购订单)带出 + entryRow.Add("FTaxPrice", PurchaseOrder[0].FTaxPrice); + //税率 ,固定为13% + entryRow.Add("FTAXRATE", "13"); + entryRow.Add("F_KDYC_FHRQ", DateTime.Now); entryRow.Add("F_KDYC_POH", "测试PO"); diff --git a/SHK3CloudWebAPI/appsettings.json b/SHK3CloudWebAPI/appsettings.json index 5a18ab2..25dcde5 100644 --- a/SHK3CloudWebAPI/appsettings.json +++ b/SHK3CloudWebAPI/appsettings.json @@ -6,17 +6,16 @@ } }, //"AllowedHosts": "*", - //"AppSettings": { - // "CloudUrl": "http://47.95.40.103/K3Cloud/", - // "KDType": "6758eb76b9ec73", - // "KDUser": "Administrator", - // "KDPwd": "1qaz2wsx" - //} - "AllowedHosts": "*", "AppSettings": { - "CloudUrl": "http://123.56.29.156/K3Cloud/", - "KDType": "5f23ccc5efaaf0", - "KDUser": "Administrator", - "KDPwd": "1qaz2wsx" + "CloudUrl": "http://47.95.40.103/K3Cloud/", + "KDType": "6758eb76b9ec73", + "KDUser": "Administrator", + "KDPwd": "1qaz2wsx" } + // "AppSettings": { + // "CloudUrl": "http://123.56.29.156/K3Cloud/", + // "KDType": "5f23ccc5efaaf0", + // "KDUser": "Administrator", + // "KDPwd": "1qaz2wsx" + // } } -- 2.52.0.windows.1 From 1f5749905338d41836b7d8b5f59fc01a3730ca05 Mon Sep 17 00:00:00 2001 From: tangj Date: Wed, 26 Nov 2025 17:51:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SHK3CloudWebAPI/appsettings.json | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/SHK3CloudWebAPI/appsettings.json b/SHK3CloudWebAPI/appsettings.json index 25dcde5..5a18ab2 100644 --- a/SHK3CloudWebAPI/appsettings.json +++ b/SHK3CloudWebAPI/appsettings.json @@ -6,16 +6,17 @@ } }, //"AllowedHosts": "*", + //"AppSettings": { + // "CloudUrl": "http://47.95.40.103/K3Cloud/", + // "KDType": "6758eb76b9ec73", + // "KDUser": "Administrator", + // "KDPwd": "1qaz2wsx" + //} + "AllowedHosts": "*", "AppSettings": { - "CloudUrl": "http://47.95.40.103/K3Cloud/", - "KDType": "6758eb76b9ec73", - "KDUser": "Administrator", - "KDPwd": "1qaz2wsx" + "CloudUrl": "http://123.56.29.156/K3Cloud/", + "KDType": "5f23ccc5efaaf0", + "KDUser": "Administrator", + "KDPwd": "1qaz2wsx" } - // "AppSettings": { - // "CloudUrl": "http://123.56.29.156/K3Cloud/", - // "KDType": "5f23ccc5efaaf0", - // "KDUser": "Administrator", - // "KDPwd": "1qaz2wsx" - // } } -- 2.52.0.windows.1