Merge pull request 'develop' (#3) from develop into main

Reviewed-on: #3
Reviewed-by: GuZhiJiang <1129395862@qq.com>

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; }
+
     }
 }

SHK3CloudWebAPI/Models/PurchaseOrderData.cs

@@ -122,6 +122,7 @@ namespace SHK3CloudWebAPI.Models
         /// </summary>
         [XmlElement("qty")]
         public decimal Qty { get; set; }
+        
 
         /// <summary>
         /// 信用模式：1 现金结算，2 账期结算，3 铺货代销

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);

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");