From 9b8d71c80aef16bc36db665f9fa9e2b92ae4d794 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期一, 29 三月 2021 17:27:21 +0800
Subject: [PATCH] 新增上传生成CLOUD外购退料单(源单:采购订单)方法

---
 CLOUDWEB/WebService1.asmx.cs |  216 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 125 insertions(+), 91 deletions(-)

diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 1c0d72f..c9ce687 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -16510,23 +16510,22 @@
         [WebMethod]
         public bool set_SavePOStockInBackBill_CLD_New(Model.ClsKf_ICStockBillMain oMain, string sHSourceType, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
         {
-            //if (sHSourceType == "1102")   //閲囪喘璁㈠崟
-            //{
-            //    if (SavePOStockInBackBill_POOrder_CLD_New(oMain, sHSourceType, oSystemParameterMain, ref sErrMsg))
-            //    {
-            //        //"淇濆瓨鎴愬姛锛�";
-            //        sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
-            //        return true;
-            //    }
-            //    else
-            //    {
-            //        //"淇濆瓨澶辫触锛�";
-            //        sErrMsg = "鍗曟嵁鍙凤細" + oMain.HBillNo + "锛屽崟鎹甀D锛�" + oMain.HInterID + "锛�" + sErrMsg;
-            //        return false;
-            //    }
-            //}
-            //else 
-                if (sHSourceType == "1105")   //閫�鏂欓�氱煡鍗�
+            if (sHSourceType == "1102")   //閲囪喘璁㈠崟
+            {
+                if (SavePOStockInBackBill_POOrder_CLD_New(oMain, sHSourceType, oSystemParameterMain, ref sErrMsg))
+                {
+                    //"淇濆瓨鎴愬姛锛�";
+                    sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+                    return true;
+                }
+                else
+                {
+                    //"淇濆瓨澶辫触锛�";
+                    sErrMsg = "鍗曟嵁鍙凤細" + oMain.HBillNo + "锛屽崟鎹甀D锛�" + oMain.HInterID + "锛�" + sErrMsg;
+                    return false;
+                }
+            }
+            else if (sHSourceType == "1105")   //閫�鏂欓�氱煡鍗�
             {
                 if (SavePOStockInBackBill_POInStockBack_CLD_New(oMain, sHSourceType, oSystemParameterMain, ref sErrMsg))
                 {
@@ -16613,51 +16612,59 @@
                     "\"IsEntryBatchFill\":\"True\",\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\"," +
                     "\"Model\": { \"FBILLNO\":\"" + oMain.HBillNo + "\"," +
                     //\"FID\":\"0\",
-                    //\"FBillTypeID\":{\"FNUMBER\":\"\"},
+                    "\"FBillTypeID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillTypeID"]) + "\"}," +
+                    "\"FBusinessType\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBusinessType"]) + "\"," +
                     //\"FBillNo\":\"\",
-                    //\"FDate\":\"1900-01-01\",
-                    //\"FMRTYPE\":\"\",
-                    //\"FMRMODE\":\"\",
-                    //\"FStockOrgId\":{\"FNumber\":\"\"},
-                    //\"FMRDeptId\":{\"FNumber\":\"\"},
+                    "\"FDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDate"]) + "\"," +
+                    //"\"FMRTYPE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FMRTYPE"]) + "\"," +
+                    //"\"FMRMODE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FMRMODE"]) + "\"," +
+                    "\"FStockOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FStockOrgId"]) + "\"}," +
+                    "\"FMRDeptId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FMRDeptId"]) + "\"}," +
                     //\"FSTOCKERGROUPID\":{\"FNumber\":\"\"},
-                    //\"FCorrespondOrgId\":{\"FNumber\":\"\"},
+                    "\"FCorrespondOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FCorrespondOrgId"]) + "\"}," +
                     //\"FSTOCKERID\":{\"FNumber\":\"\"},
-                    //\"FMRREASON\":{\"FNumber\":\"\"},
-                    //\"FRequireOrgId\":{\"FNumber\":\"\"},
-                    //\"FPurchaseOrgId\":{\"FNumber\":\"\"},
-                    //\"FPURCHASEDEPTID\":{\"FNumber\":\"\"},
-                    //\"FPURCHASERGROUPID\":{\"FNumber\":\"\"},
-                    //\"FPURCHASERID\":{\"FNumber\":\"\"},
-                    //\"FSupplierID\":{\"FNumber\":\"\"},
+                    //"\"FMRREASON\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FMRREASON"]) + "\"}," +
+                    "\"FRequireOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FRequireOrgId"]) + "\"}," +
+                    "\"FPurchaseOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FPurchaseOrgId"]) + "\"}," +
+                    "\"FPURCHASEDEPTID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FPURCHASEDEPTID"]) + "\"}," +
+                    "\"FPURCHASERGROUPID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FPURCHASERGROUPID"]) + "\"}," +
+                    "\"FPURCHASERID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FPURCHASERID"]) + "\"}," +
+                    "\"FSupplierID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FSupplierID"]) + "\"}," +
                     //\"FDESCRIPTION\":\"\",
-                    //\"FACCEPTORID\":{\"FNumber\":\"\"},
-                    //\"FAcceptAddress\":\"\",
-                    //\"FSettleId\":{\"FNumber\":\"\"},
-                    //\"FCHARGEID\":{\"FNumber\":\"\"},
-                    //\"FOwnerTypeIdHead\":\"\",
-                    //\"FOwnerIdHead\":{\"FNumber\":\"\"},
+                    //"\"FACCEPTORID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FACCEPTORID"]) + "\"}," +    //鏀炬渶搴曚笅
+                    "\"FAcceptAddress\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FAcceptAddress"]) + "\"," +
+                    //"\"FSettleId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FSettleId"]) + "\"}," +    //鏀炬渶搴曚笅
+                    //"\"FCHARGEID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FCHARGEID"]) + "\"}," +    //鏀炬渶搴曚笅
+                    //"\"FOwnerTypeIdHead\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FOwnerTypeIdHead"]) + "\"," +
+                    //"\"FOwnerIdHead\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FOwnerIdHead"]) + "\"}," +
                     //\"FScanPoint\":{\"FNUMBER\":\"\"},
                     //\"FConfirmerId\":{\"FUserID\":\"\"},
                     //\"FConfirmDate\":\"1900-01-01\",
                     //\"FScanBox\":\"\",
                     //\"FCDateOffsetUnit\":\"\",
                     //\"FCDateOffsetValue\":\"0\",
-                    //\"FAcceptorContactID\":{\"FCONTACTNUMBER\":\"\"},
+                    "\"FAcceptorContactID\":{\"FCONTACTNUMBER\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FAcceptorContactID"]) + "\"}," +
+                    //
+                    "\"FREPLENISHMODE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FREPLENISHMODE"]) + "\"," +
+                    "\"FACCEPTORID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FACCEPTORID"]) + "\"}," +
+                    "\"FSettleId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FSettleId"]) + "\"}," +
+                    "\"FCHARGEID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FCHARGEID"]) + "\"}," +
 
-                    //\"FPURMRBFIN\":{\"FEntryId\":\"0\",
-                    //\"FSettleOrgId\":{\"FNumber\":\"\"},
-                    //\"FSETTLETYPEID\":{\"FNumber\":\"\"},
-                    //\"FSettleCurrId\":{\"FNumber\":\"\"},
-                    //\"FPAYCONDITIONID\":{\"FNumber\":\"\"},
-                    //\"FIsIncludedTax\":\"false\",
-                    //\"FPRICETIMEPOINT\":\"\",
+                    "\"FPURMRBFIN\":{" +
+                    //\"FEntryId\":\"0\",
+                    "\"FSettleOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FSettleOrgId"]) + "\"}," +
+                    "\"FSETTLETYPEID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FSETTLETYPEID"]) + "\"}," +
+                    "\"FSettleCurrId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FSettleCurrId"]) + "\"}," +
+                    "\"FPAYCONDITIONID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FPAYCONDITIONID"]) + "\"}," +
+                    "\"FIsIncludedTax\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FIsIncludedTax"]) + "\"," +
+                    //"\"FPriceTimePoint\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FPriceTimePoint"]) + "\"," +
                     //\"FPRICELISTID\":{\"FNumber\":\"\"},
                     //\"FDISCOUNTLISTID\":{\"FNumber\":\"\"},
-                    //\"FLOCALCURRID\":{\"FNumber\":\"\"},
-                    //\"FEXCHANGETYPEID\":{\"FNumber\":\"\"},
-                    //\"FEXCHANGERATE\":\"0\",
-                    //\"FISPRICEEXCLUDETAX\":\"false\"},
+                    "\"FLOCALCURRID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FLOCALCURRID"]) + "\"}," +
+                    "\"FEXCHANGETYPEID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FEXCHANGETYPEID"]) + "\"}," +
+                    "\"FEXCHANGERATE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FEXCHANGERATE"]) + "\"," +
+                    "\"FPAYORGID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FPAYORGID"]) + "\"}," +
+                    "\"FIsPriceExcludeTax\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FIsPriceExcludeTax"]) + "\"}," +
                     "\"FPURMRBENTRY\": [  ";
                     string sJson_Entry = "";
                     for (int i = 0; i < Ds.Tables[1].Rows.Count; i++)
@@ -16688,65 +16695,92 @@
 
                         sJson_Entry = sJson_Entry + "{" +
                         //\"FEntryID\":\"0\",
-                        //\"FRowType\":\"\",
-                        //\"FMATERIALID\":{\"FNumber\":\"\"},
-                        //\"FMaterialDesc\":\"\",
-                        //\"FParentMatId\":{\"FNUMBER\":\"\"},
+                        "\"FRowType\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FRowType"]) + "\"," +
+                        "\"FMATERIALID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMATERIALID"]) + "\"}," +
+                        "\"FMaterialDesc\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMaterialDesc"]) + "\"," +
+                        "\"FParentMatId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FParentMatId"]) + "\"}," +
                         //\"FProjectNo\":\"\",
-                        //\"FUnitID\":{\"FNumber\":\"\"},
-                        //\"FRMREALQTY\":\"0\",
-                        //\"FREPLENISHQTY\":\"0\",
-                        //\"FKEAPAMTQTY\":\"0\",
-                        //\"FPRICEUNITID\":{\"FNumber\":\"\"},
-                        //\"FSTOCKID\":{\"FNumber\":\"\"},
-                        //\"FSTOCKLOCID\":{\"FSTOCKLOCID__FF100001\":{\"FNumber\":\"\"},\"FSTOCKLOCID__FF100002\":{\"FNumber\":\"\"}},
-                        //\"FStockStatusId\":{\"FNumber\":\"\"},
-                        //\"FNOTE\":\"\",
-                        //\"FTaxCombination\":{\"FNumber\":\"\"},
-                        //\"FPrice\":\"0\",
-                        //\"FExtAuxUnitId\":{\"FNumber\":\"\"},
+                        "\"FUnitID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FUnitID"]) + "\"}," +
+                        "\"FRMREALQTY\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FRMREALQTY"]) + "\"," +
+                        "\"FREPLENISHQTY\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FREPLENISHQTY"]) + "\"," +
+                        "\"FKEAPAMTQTY\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FKEAPAMTQTY"]) + "\"," +
+                        "\"FPRICEUNITID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPRICEUNITID"]) + "\"}," +
+                        "\"FSTOCKID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSTOCKID"]) + "\"}," +
+                        sJson_StockPlace +
+                        "\"FStockStatusId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockStatusId"]) + "\"}," +
+                        "\"FNOTE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FNOTE"]) + "\"," +
+                        "\"FTaxCombination\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FTaxCombination"]) + "\"}," +
+                        "\"FPrice\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPrice"]) + "\"," +
+                        "\"FExtAuxUnitId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExtAuxUnitId"]) + "\"}," +
                         //\"FExtAuxUnitQty\":\"0\",
-                        //\"FREQTRACENO\":\"\",
-                        //\"FIsReceiveUpdateStock\":\"false\",
+                        "\"FREQTRACENO\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FREQTRACENO"]) + "\"," +
+                        "\"FIsReceiveUpdateStock\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsReceiveUpdateStock"]) + "\"," +
                         //\"FInvoicedJoinQty\":\"0\",
-                        //\"FGiveAway\":\"false\",
-                        //\"FPriceBaseQty\":\"0\",
+                        "\"FGiveAway\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FGiveAway"]) + "\"," +
+                        "\"FPriceBaseQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPriceBaseQty"]) + "\"," +
                         //\"FSetPriceUnitID\":{\"FNumber\":\"\"},
-                        //\"FCarryUnitId\":{\"FNumber\":\"\"},
-                        //\"FCarryQty\":\"0\",
-                        //\"FCarryBaseQty\":\"0\",
-                        //\"FPOORDERENTRYID\":\"0\",
-                        //\"FBILLINGCLOSE\":\"false\",
-                        //\"FPriceListEntry\":{\"FNUMBER\":\"\"},
-                        //\"FAuxPropID\":{\"FAUXPROPID__FF100002\":{\"FNumber\":\"\"}},
+                        "\"FCarryUnitId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FCarryUnitId"]) + "\"}," +
+                        "\"FCarryQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FCarryQty"]) + "\"," +
+                        "\"FCarryBaseQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FCarryBaseQty"]) + "\"," +
+                        "\"FPOORDERENTRYID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPOORDERENTRYID"]) + "\"," +
+                        "\"FBILLINGCLOSE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBILLINGCLOSE"]) + "\"," +
+                        "\"FPriceListEntry\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPriceListEntry"]) + "\"}," +
+                        "\"FAuxPropId\":{\"FAUXPROPID__FF100002\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAuxPropId"]) + "\"}}," +
                         //\"FRMMUSTQTY\":\"0\",
-                        //\"FBOMID\":{\"FNumber\":\"\"},
-                        //\"FSupplierLot\":\"\",
-                        //\"FLot\":{\"FNumber\":\"\"},
+                        "\"FBOMID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBOMID"]) + "\"}," +
+                        "\"FSupplierLot\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSupplierLot"]) + "\"," +
+                        sJson_BatchNo +
                         //\"FProduceDate\":\"1900-01-01\",
                         //\"FEXPIRYDATE\":\"1900-01-01\",
                         //\"FAUXUNITQTY\":\"0\",
-                        //\"FENTRYTAXRATE\":\"0\",
-                        //\"FDISCOUNTRATE\":\"0\",
-                        //\"FTAXPRICE\":\"0\",
-                        //\"FIsStock\":\"false\",
+                        "\"FENTRYTAXRATE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FENTRYTAXRATE"]) + "\"," +
+                        "\"FDISCOUNTRATE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FDISCOUNTRATE"]) + "\"," +
+                        "\"FTAXPRICE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FTAXPRICE"]) + "\"," +
+                        "\"FIsStock\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsStock"]) + "\"," +
                         //\"FChargeProjectID\":{\"FNumber\":\"\"},
-                        //\"FMtoNo\":\"\",
+                        "\"FMtoNo\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMtoNo"]) + "\"," +
+                        //
+                        "\"FORDERNO\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FORDERNO"]) + "\"," +
+                        "\"FPRICECOEFFICIENT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPRICECOEFFICIENT"]) + "\"," +
+                        "\"FKEEPERID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FKEEPERID"]) + "\"}," +
+                        "\"FAUXUNITID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAUXUNITID"]) + "\"}," +
+                        "\"FBASEUNITID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBASEUNITID"]) + "\"}," +
+                        "\"FSNUNITID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSNUNITID"]) + "\"}," +
+                        "\"FSRCBIZUNITID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSRCBIZUNITID"]) + "\"}," +
+                        "\"FSRCBILLTYPEID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSRCBILLTYPEID"]) + "\"," +
+                        "\"FSRCBILLNO\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSRCBILLNO"]) + "\"," +
+                        "\"FPURBASENUM\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPURBASENUM"]) + "\"," +
+                        "\"FSTOCKBASEDEN\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSTOCKBASEDEN"]) + "\"," +
+                        "\"FCostPrice\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FCostPrice"]) + "\"," +
+                        "\"FPoRequireOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPoRequireOrgId"]) + "\"}," +
 
                         //\"FEntryPruCost\":[{\"FDetailID\":\"0\"}],
 
-                        //\"FTaxDetailSubEntity\":[{\"FDetailID\":\"0\",
-                        //\"FTaxRate\":\"0\"}],
+                        "\"FTaxDetailSubEntity\":[{" +
+                        //\"FDetailID\":\"0\",
+                        "\"FTaxRateId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FTaxRateId"]) + "\"}," +
+                        "\"FTaxRate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FTaxRate"]) + "\"," +
+                        "\"FTaxAmount\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FTaxAmount"]) + "\"," +
+                        "\"FCostPercent\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FCostPercent"]) + "\"," +
+                        "\"FTaxCostAmount\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FTaxCostAmount"]) + "\"," +
+                        "\"FVAT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FVAT"]) + "\"," +
+                        "\"FSellerWithholding\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSellerWithholding"]) + "\"," +
+                        "\"FBuyerWithholding\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBuyerWithholding"]) + "\"," +
+                        " } ]," +
 
                         //\"FSerialSubEntity\":[{\"FDetailID\":\"0\",
                         //\"FSerialNo\":\"\",
                         //\"FSerialNote\":\"\"}]
 
-                       "\"FPURMRBENTRY_Link\": [ {  " +
-                           "\"FPURMRBENTRY_Link_FRuleId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPURMRBENTRY_Link_FRuleId"]) + "\"," +
-                           "\"FPURMRBENTRY_Link_FSTableName\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPURMRBENTRY_Link_FSTableName"]) + "\"," +
-                           "\"FPURMRBENTRY_Link_FSBillId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPURMRBENTRY_Link_FSBillId"]) + "\"," +
-                           "\"FPURMRBENTRY_Link_FSId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPURMRBENTRY_Link_FSId"]) + "\"" +
+                        "\"FPURMRBENTRY_Link\": [ {  " +
+                        "\"FPURMRBENTRY_Link_FFlowId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPURMRBENTRY_Link_FFlowId"]) + "\"," +
+                        "\"FPURMRBENTRY_Link_FFlowLineId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPURMRBENTRY_Link_FFlowLineId"]) + "\"," +
+                        "\"FPURMRBENTRY_Link_FRuleId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPURMRBENTRY_Link_FRuleId"]) + "\"," +
+                        "\"FPURMRBENTRY_Link_FSTableName\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPURMRBENTRY_Link_FSTableName"]) + "\"," +
+                        "\"FPURMRBENTRY_Link_FSBillId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPURMRBENTRY_Link_FSBillId"]) + "\"," +
+                        "\"FPURMRBENTRY_Link_FBASEUNITQTYOLD\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPURMRBENTRY_Link_FBASEUNITQTYOLD"]) + "\"," +
+                        "\"FPURMRBENTRY_Link_FCARRYBASEQTYOLD\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPURMRBENTRY_Link_FCARRYBASEQTYOLD"]) + "\"," +
+                        "\"FPURMRBENTRY_Link_FSId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPURMRBENTRY_Link_FSId"]) + "\"" +
                         " } ]," +
                         " \"FBFLowId\":{\"FID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBFLowId"]) + "\"}}";
                     }

--
Gitblit v1.9.1