1

jingh

2021-02-23 3f4ff834c23c06783d2719e14ceb89f405e92ae8

1

 WebAPI/Controllers/LookingForBillController.cs

@@ -207,7 +207,7 @@
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "生成下架找货单成功！单据号为：" + list[0].HBillNo;
                objJsonResult.Message = "生成找货单成功！单据号为：" + list[0].HBillNo;
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -259,7 +259,7 @@
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "生成上架归还单成功！单据号为：" + list[0].HBillNo;
                objJsonResult.Message = "生成归还单成功！单据号为：" + list[0].HBillNo;
                objJsonResult.data = null;
                return objJsonResult;
            }

 WebAPI/Controllers/MoveStockBillController.cs

@@ -44,7 +44,7 @@
        public DataSet ds = new DataSet();
        public ClsGy_BarCodeBill_WMS_Model_View oView = new ClsGy_BarCodeBill_WMS_Model_View();
        public ClsKF_PonderationBillMain_Temp model = new ClsKF_PonderationBillMain_Temp();
        public JsonResult objJsonResult = new JsonResult();
        private JsonResult objJsonResult = new JsonResult();
        private json objjson = new json();

        /// <summary>
@@ -170,7 +170,7 @@
        //        {
        //            sQty = sRelQty;
        //        }
        //        else if(sRelQty == 0)
        //        else if (sRelQty == 0)
        //        {
        //            objJsonResult.code = "0";
        //            objJsonResult.count = 0;
@@ -256,8 +256,8 @@
                        for (int i = 0; i < dsTBarCode.Tables[0].Rows.Count; i++)
                        {
                            sBarCode_MX = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HBarCodeMX"]);
                            objJsonResult= (JsonResult)get_InfoByBarCode_Source_Json_s(sBarCode_MX, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID);
                            if(objJsonResult.code == "0")
                            objJsonResult = (JsonResult)get_InfoByBarCode_Source_Json_s(sBarCode_MX, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID);
                            if (objJsonResult.code == "0")
                            {
                                return objJsonResult;
                            }
@@ -265,7 +265,7 @@
                        return objJsonResult;
                    }
                }
                

            }
            catch (Exception e)
            {
@@ -285,7 +285,6 @@
                string sErrMsg = "";
                bool sBool = false;
                double sRelQty = 0;
                double sRelQty2 = 0;
                oView = webserver.get_InfoByBarCode_Source(sCode, sInterID, ref sBool, ref DBUtility.ClsPub.sErrInfo);
                if (oView == null)
                {
@@ -295,18 +294,17 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (oView.HBarCodeType == "唯一条码" && sQty > 0 && oView.HQty < sQty)
                {
                    sRelQty2 = oView.HQty;
                    sRelQty = oView.HQty;
                }
                else if (sQty > 0)
                {
                    sRelQty2 = sQty;
                    sRelQty = sQty;
                }
                else
                {
                    sRelQty2 = oView.HQty;
                    sRelQty = oView.HQty;
                }

                model.HInterID = DBUtility.ClsPub.isLong(sInterID);
@@ -322,9 +320,6 @@
                model.HBarCode = oView.HBarCode;
                model.HBatchNo = oView.HBatchNo;
                model.HMTONo = oView.HMTONo;

                //model.HWhID = oView.HWHID;
                //model.HStockPlaceID = oView.HSPID;

                model.HWhID = DBUtility.ClsPub.isLong(HWHID);
                model.HStockPlaceID = DBUtility.ClsPub.isLong(HSPID);
@@ -345,21 +340,22 @@

                WebS.WebService1 oWebs = new WebS.WebService1();
                //if (webserver.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
                objJsonResult = CheckQtyByBarCode_Json(model.HInterID, model.HBillType, model.HBarCode, ref SCWhID, ref SCSPID, sRelQty2, ref sRelQty);
                
                if (objJsonResult.count == 1)
                bool flag = oWebs.Get_CheckQtyByBarCode_GetWhAndSP(model.HInterID, model.HBillType, model.HBarCode, ref SCWhID, ref SCSPID, sRelQty, ref sRelQty);
                if (flag)
                {
                    sQty = sRelQty;
                    model.HSCWHID = SCWhID;
                    model.HOutStockPlaceID = SCSPID;
                }
                else if (objJsonResult.count == 0)
                else if (sRelQty == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "2-无库存！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    sQty = sRelQty;
                }

                if (oWebs.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
@@ -375,7 +371,7 @@
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "4-扫码失败！" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = model.HBarCode;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
@@ -383,90 +379,6 @@
            {

                throw;
            }
        }

        //根据条码 数量 判断条码库存 是否充足 并且带出 仓库仓位
        public JsonResult CheckQtyByBarCode_Json(long InterID, string sBillType, string sBarCode, ref long HWHID, ref long HSPID, double sQty, ref double sRelQty)
        {
            DataSet DS;
            DataSet DSErp;
            try
            {
                //单条码，一张单据一条条码(凯波)
                //DS = oCn.RunProcReturn("exec h_p_KF_ICInventory_WMS_GetWHAndSP_Single " + InterID.ToString() + ",'" + sBillType + "','" + sBarCode + "'," + HWHID.ToString() + "," + HSPID.ToString(), "h_p_KF_ICInventory_WMS_GetWHAndSP_Single", ref DBUtility.ClsPub.sExeReturnInfo);
                //判断条码库存
                DS = new SQLHelper.ClsCN().RunProcReturn("exec h_p_KF_ICInventory_WMS_GetWHAndSP " + InterID.ToString() + ",'" + sBillType + "','" + sBarCode + "'," + HWHID.ToString() + "," + HSPID.ToString(), "h_p_KF_ICInventory_WMS_GetWHAndSP", ref DBUtility.ClsPub.sExeReturnInfo);
                if (DS.Tables[0].Rows.Count == 0)
                {
                    sRelQty = 0;
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "4-扫码失败！";
                    objJsonResult.data = DS;
                    return objJsonResult;
                }
                else
                {
                    double sKFQty = 0;
                    double sKFQtyErp = 0;
                    sKFQty = DBUtility.ClsPub.isDoule(DS.Tables[0].Rows[0]["HKFQty"]);
                    HWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HWhID"]);
                    HSPID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HSPID"]);
                    //直接返回999
                    DSErp = new SQLHelper.ClsCN().RunProcReturn("exec h_p_IF_ICInventory_WMS_GetWHAndSP " + InterID.ToString() + ",'" + sBillType + "','" + sBarCode + "'," + HWHID.ToString() + "," + HSPID.ToString(), "h_p_IF_ICInventory_WMS_GetWHAndSP", ref DBUtility.ClsPub.sExeReturnInfo);
                    if (DSErp.Tables[0].Rows.Count == 0)
                    {
                        sRelQty = 0;//不会走
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "4-扫码失败！";
                        objJsonResult.data = DS;
                        return objJsonResult;
                    }
                    sKFQtyErp = DBUtility.ClsPub.isDoule(DSErp.Tables[0].Rows[0]["HKFQty"]);//9999
                    if (sQty > sKFQty && sQty > sKFQtyErp) //当库存小于标签数量时 取库存数量
                    {
                        sRelQty = sKFQtyErp;
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "4-扫码失败！";
                        objJsonResult.data = DS;
                        return objJsonResult;
                    }
                    else if (sQty > sKFQty && sQty < sKFQtyErp)  //当库存小于标签数量时 取库存数量
                    {
                        sRelQty = sKFQty;
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "4-扫码失败！";
                        objJsonResult.data = DS;
                        return objJsonResult;
                    }
                    else if (sQty < sKFQty && sQty > sKFQtyErp)//无效
                    {
                        sRelQty = sKFQtyErp;
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "4-扫码失败！";
                        objJsonResult.data = DS;
                        return objJsonResult;
                    }
                    else
                    {
                        sRelQty = sQty;
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "4-扫码失败！";
                        objJsonResult.data = DS;
                        return objJsonResult;
                    }
                }
            }
            catch (Exception e)
            {
                sRelQty = 0;
                throw (e);
            }
        }


 WebAPI/Models/LookingForBill.cs

@@ -18,7 +18,7 @@
        public string HGroup { get; set; }//班组
        public int HSourceID { get; set; }//生产资源ID
        public string HSource { get; set; }//生产资源
        public string HMakerID { get; set; }//制单人编码
        public int HMakerID { get; set; }//制单人ID
        public string HMaker { get; set; }//制单人
        public double HQty { get; set; }//数量
        public int HMaterID { get; set; }//物料ID

 WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user

@@ -10,7 +10,7 @@
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:23</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.dll">
      <publishTime>02/22/2013 08:43:40</publishTime>
@@ -19,19 +19,19 @@
      <publishTime>02/22/2013 08:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 14:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
      <publishTime>03/18/2015 17:02:50</publishTime>
@@ -43,7 +43,7 @@
      <publishTime>07/25/2012 11:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>08/03/2014 20:33:56</publishTime>
@@ -52,13 +52,13 @@
      <publishTime>01/04/2011 13:48:18</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>05/21/2020 10:51:50</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/15/2015 17:57:08</publishTime>
@@ -124,7 +124,7 @@
      <publishTime>11/28/2018 13:01:00</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 04:02:18</publishTime>
@@ -157,10 +157,17 @@
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>02/22/2021 22:22:40</publishTime>
<<<<<<< HEAD
      <publishTime>02/22/2021 09:56:46</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>02/22/2021 22:22:40</publishTime>
      <publishTime>02/22/2021 09:56:46</publishTime>
=======
      <publishTime>02/21/2021 11:56:27</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>02/21/2021 11:56:27</publishTime>
>>>>>>> parent of 9ba27cd (nothing)
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>02/04/2021 21:35:21</publishTime>
@@ -178,163 +185,167 @@
      <publishTime>03/26/2019 14:23:20</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>05/21/2020 10:51:50</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:23</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:23</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:23</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:23</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>01/21/2021 13:19:40</publishTime>
      <publishTime>01/24/2021 15:32:23</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/24/2021 15:32:22</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>02/22/2021 09:23:05</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>02/22/2021 09:23:05</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>02/22/2021 09:23:05</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>02/22/2021 09:23:05</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>02/22/2021 09:23:05</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>02/22/2021 09:23:05</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>02/22/2021 09:23:05</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>02/22/2021 09:25:21</publishTime>
      <publishTime>02/22/2021 09:23:05</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>02/22/2021 09:23:05</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>02/22/2021 09:23:05</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>02/22/2021 09:25:21</publishTime>
      <publishTime>02/22/2021 09:23:05</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>02/22/2021 09:23:05</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>02/22/2021 09:23:05</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>02/22/2021 09:25:21</publishTime>
      <publishTime>02/22/2021 09:23:05</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>02/22/2021 09:23:05</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>02/22/2021 09:25:21</publishTime>
      <publishTime>02/22/2021 09:23:05</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>02/22/2021 09:23:05</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>02/22/2021 09:23:05</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>02/22/2021 22:22:51</publishTime>
<<<<<<< HEAD
      <publishTime>02/22/2021 09:57:03</publishTime>
=======
      <publishTime>02/21/2021 12:21:03</publishTime>
>>>>>>> parent of 9ba27cd (nothing)
    </File>
  </ItemGroup>
</Project>

 WebAPI/Web References/WebS/Reference.cs

Diff too large