1

duhe

2024-08-19 46f3b5bd6b27e6d34bf7c3ce0e408ae1d6098430

1

 BLL/bin/Release/BLL.dll

Binary files differ

 BLL/bin/Release/BLL.pdb

Binary files differ

 BLL/bin/Release/DAL.dll

Binary files differ

 BLL/bin/Release/DAL.pdb

Binary files differ

 BLL/bin/Release/DBUtility.dll

Binary files differ

 BLL/bin/Release/DBUtility.pdb

Binary files differ

 BLL/bin/Release/Model.dll

Binary files differ

 BLL/bin/Release/Model.pdb

Binary files differ

 BLL/bin/Release/Pub_Control.dll

Binary files differ

 BLL/bin/Release/Pub_Control.pdb

Binary files differ

 DAL/bin/Release/DAL.dll

Binary files differ

 DAL/bin/Release/DAL.pdb

Binary files differ

 DAL/bin/Release/DBUtility.dll

Binary files differ

 DAL/bin/Release/DBUtility.pdb

Binary files differ

 DAL/bin/Release/Model.dll

Binary files differ

 DAL/bin/Release/Model.pdb

Binary files differ

 DAL/bin/Release/Pub_Control.dll

Binary files differ

 DAL/bin/Release/Pub_Control.pdb

Binary files differ

 DAL/Ó¦¸¶¹ÜÀí/ClsYF_PayMentBill.cs

@@ -102,7 +102,7 @@
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() +
                      ",'" + oSub.HReceiveBillNo + "'," + oSub.HReceiveBillInterID.ToString() + "," + oSub.HReceiveBillEntryID.ToString() + "," + oSub.HSourceDate.ToString() + "," + oSub.HSourceMoney.ToString() +
                      ",'" + oSub.HReceiveBillNo + "'," + oSub.HReceiveBillInterID.ToString() + "," + oSub.HReceiveBillEntryID.ToString() + ",'" + oSub.HSourceDate.ToString() + "'," + oSub.HSourceMoney.ToString() +
                      "," + oSub.HSourceMoneyBB.ToString() + "," + oSub.HReadyCheckMoney.ToString() + "," + oSub.HUnCheckMoney.ToString() + "," + oSub.HCheckMoney.ToString() + "," + oSub.HCheckMoneyBB.ToString() + "," + oSub.HInovceExRate.ToString() + ",'" + oSub.HSeContractBillNo + "'" +
                      "," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
                      "," + oSub.HPOContractInterID.ToString() + "," + oSub.HPOContractEntryID.ToString() + ",'" + oSub.HPOContractBillNo + "'," + oSub.HSeContractInterID.ToString() + "," + oSub.HSeContractEntryID.ToString() + ",'" + oSub.HSeContractBillNo + "'" +
@@ -172,7 +172,7 @@
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() +
                      ",'" + oSub.HReceiveBillNo + "'," + oSub.HReceiveBillInterID.ToString() + "," + oSub.HReceiveBillEntryID.ToString() + "," + oSub.HSourceDate.ToString() + "," + oSub.HSourceMoney.ToString() +
                      ",'" + oSub.HReceiveBillNo + "'," + oSub.HReceiveBillInterID.ToString() + "," + oSub.HReceiveBillEntryID.ToString() + ",'" + oSub.HSourceDate.ToString() + "'," + oSub.HSourceMoney.ToString() +
                      "," + oSub.HSourceMoneyBB.ToString() + "," + oSub.HReadyCheckMoney.ToString() + "," + oSub.HUnCheckMoney.ToString() + "," + oSub.HCheckMoney.ToString() + "," + oSub.HCheckMoneyBB.ToString() + "," + oSub.HInovceExRate.ToString() + ",'" + oSub.HSeContractBillNo + "'" +
                      "," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
                      "," + oSub.HPOContractInterID.ToString() + "," + oSub.HPOContractEntryID.ToString() + ",'" + oSub.HPOContractBillNo + "'," + oSub.HSeContractInterID.ToString() + "," + oSub.HSeContractEntryID.ToString() + ",'" + oSub.HSeContractBillNo + "'" +

 DBUtility/bin/Release/DBUtility.dll

Binary files differ

 DBUtility/bin/Release/DBUtility.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Control.dll

Binary files differ

 DBUtility/bin/Release/Pub_Control.pdb

Binary files differ

 DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache

Binary files differ

 DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache

Binary files differ

 DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache

Binary files differ

 DBUtility/obj/Release/DBUtility.dll

Binary files differ

 DBUtility/obj/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/DBUtility.dll

Binary files differ

 Model/bin/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/Model.dll

Binary files differ

 Model/bin/Release/Model.pdb

Binary files differ

 Model/bin/Release/Pub_Control.dll

Binary files differ

 Model/bin/Release/Pub_Control.pdb

Binary files differ

 Model/obj/Release/Model.csproj.AssemblyReference.cache

Binary files differ

 Model/obj/Release/Model.dll

Binary files differ

 Model/obj/Release/Model.pdb

Binary files differ

 NETERPNoWin/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll

Binary files differ

 NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.ResolveComReference.cache

Binary files differ

 NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache

Binary files differ

 PayM/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 PayM/obj/x86/Debug/Interop.gregn6Lib.dll

Binary files differ

 PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache

Binary files differ

 PayM/obj/x86/Debug/PayM.csprojAssemblyReference.cache

Binary files differ

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -1941,7 +1941,11 @@
                    {
                        omodel.Sc_ProcessExchangeBill_SaveDeptIsNull = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //==============================入库申请单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_StockInRequestBill_AutoCheck")
                    {
                        omodel.Kf_StockInRequestBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    ////=========工序进站单
                    ////自动匹配流水号

 Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs

@@ -627,12 +627,15 @@
        public string Gy_RoutingBill_SaveAutoAddnew;                //保存后变为新增状态
        public string Gy_RoutingBill_DeleterAndMakerMustSame;       //删除人必须是制单人
        public string Gy_RoutingBill_SaveAutoLastProc;              //保存到数据库时自动加上转工序
        


        ////工序进站单
        //public string MES_StationBill_ProcNo; //自动匹配流水号
        //public string MES_StationBill_ProcNoByUser; //只显示用户对应工序

        //入库申请
        public string Kf_StockInRequestBill_AutoCheck;       //保存后是否自动审核

    }
         
}

 Pub_Control/bin/Release/Pub_Control.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Control.pdb

Binary files differ

 SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache

Binary files differ

 WebAPI/Controllers/CGGL/Cg_PayableBillController.cs

@@ -1474,5 +1474,56 @@
        }
        #endregion

        #region åº”付单列表 æŸ¥è¯¢ä¾›åº”商付款计划表
        /// <summary>
        /// è¿”回应收单列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Cg_PayableBill/SupplierPayPlanList")]
        [HttpGet]
        public object SupplierPayPlanList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierPayPlanList order by å•æ®å· desc", "h_v_Gy_SupplierPayPlanList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_SupplierPayPlanList where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by å•æ®å· desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_SupplierPayPlanList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}

 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs

@@ -1911,7 +1911,6 @@
        }
        #endregion


        #region å·¥åºæµè½¬å¡åˆ—表
        /// <summary>
        /// èŽ·å–工序流转卡列表信息
@@ -1965,5 +1964,71 @@
        }
        #endregion

        #region[批量拆分生成流转卡]
        /// <summary>
        /// è¿”回拆分后的生产订单信息
        /// </summary>
        /// <param name="hmainid">生产任务单主子ID</param>
        /// <returns>object</returns>
        [Route("Sc_ProcessExchangeBill/BatchSpilt")]
        [HttpGet]
        public object BatchSpilt(string HInterID, string user)
        {
            try
            {
                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "源单主子id为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string[] HInterEntryIDArr = HInterID.Split(',');

                string[] HData;

                for (int i = 0; i < HInterEntryIDArr.Length; i++)
                {
                    string[] HIDs = HInterEntryIDArr[i].Split('@');

                    string sql = "exec h_p_Sc_ProcessExchange_BatchSplit '" + HIDs[0] + "','" + HIDs[1] + "'";

                    ds = oCN.RunProcReturn(sql, "h_p_Sc_ProcessExchange_BatchSplit");


                }

               

                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "拆分生产订单无数据！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}

 WebAPI/Controllers/LMESController.cs

@@ -1708,7 +1708,7 @@
            try
            {

                ds = oCN.RunProcReturn(" exec h_p_Sc_ProcessExchangeBillQuery_TechParam '" + hinterid + "' and HEntryID='" + HEntryID + "'", "h_v_Sc_ProcessExchangeBillQuerySub");
                ds = oCN.RunProcReturn(" exec h_p_Sc_ProcessExchangeBillQuery_TechParam '" + hinterid + "' , '" + HEntryID + "'", "h_p_Sc_ProcessExchangeBillQuery_TechParam");
            }
            catch (Exception e)
            {

 WebAPI/Controllers/OtherInStockController.cs

@@ -78,265 +78,248 @@

            string sErrMsg = "";
            bool bResult;
            //获取系统参数
            if (oSystemParameter.ShowBill(ref sErrMsg) == true)
            {
                if (oSystemParameter.omodel.WMS_CampanyName == "森楷") //系统参数  å®¢æˆ·å®šåˆ¶åŒ–名称     ç©ºç™½ä¸ºé€šç”¨
                {
                    DataSet ds;
                    string sql = "select HBarCode,HSourceInterID,HSourceEntryID,HSourceBillNo from Gy_BarCodeBill with(nolock) where HBarCode = '" + sCode + "'";
                    string HDataBaseName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");//获取金蝶数据库名称
                    string HSourceBillNo = "";
                    Int64 HSourceInterID = 0;
            ////获取系统参数
            //if (oSystemParameter.ShowBill(ref sErrMsg) == true)
            //{
            //    if (oSystemParameter.omodel.WMS_CampanyName == "森楷" && sSourceType == "1241") //客户为森楷，并且为其他入库单模块时进入判断
            //    {
            //        DataSet ds;
            //        string sql = "select HBarCode,HSourceInterID,HSourceEntryID,HSourceBillNo from Gy_BarCodeBill with(nolock) where HBarCode = '" + sCode + "'";
            //        string HDataBaseName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");//获取金蝶数据库名称
            //        string HSourceBillNo = "";
            //        Int64 HSourceInterID = 0;

                    ds = oCn.RunProcReturn(sql, "Gy_BarCodeBill");
                    //判断条码信息是否在条码档案中
                    if (ds == null || ds.Tables[0].Rows.Count < 1)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "条码档案中不存在条码编号：" + sCode;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        //获取入库申请单单号/主ID
                        HSourceBillNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSourceBillNo"]);
                        HSourceInterID = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[0]["HSourceInterID"]);                        
                        //根据入库申请单单号判断单据信息是否已经同步到金蝶
                        sql = string.Format(@"select * from FROM {0}..T_STK_MISCELLANEOUS with(nolock) where FBILLNO = '" + HSourceBillNo + "'", HDataBaseName);
                        ds = oCn.RunProcReturn(sql, "T_STK_MISCELLANEOUS");
                        //入库申请单没有同步到金蝶则进行同步
                        if (ds == null || ds.Tables[0].Rows.Count < 1)
                        {
                            sql = "exec h_p_Kf_StockInRequestBillToErp " + HSourceInterID + "," + HSourceBillNo;
                            ds = oCn.RunProcReturn(sql, "h_p_Kf_StockInRequestBillToErp");
            //        ds = oCn.RunProcReturn(sql, "Gy_BarCodeBill");
            //        //判断条码信息是否在条码档案中
            //        if (ds == null || ds.Tables[0].Rows.Count < 1)
            //        {
            //            objJsonResult.code = "0";
            //            objJsonResult.count = 0;
            //            objJsonResult.Message = "条码档案中不存在此条码编号：" + sCode;
            //            objJsonResult.data = null;
            //            return objJsonResult;
            //        }
            //        else
            //        {
            //            //获取入库申请单单号/主ID
            //            HSourceBillNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSourceBillNo"]);
            //            HSourceInterID = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[0]["HSourceInterID"]);                        
            //            //根据入库申请单单号判断单据信息是否已经同步到金蝶
            //            sql = string.Format(@"select * from FROM {0}..TFKO_t_Cust100009 with(nolock) where FBILLNO = '" + HSourceBillNo + "'", HDataBaseName);
            //            ds = oCn.RunProcReturn(sql, "TFKO_t_Cust100009");
            //            //入库申请单没有同步到金蝶则进行同步
            //            if (ds == null || ds.Tables[0].Rows.Count < 1)
            //            {
            //                sql = "exec h_p_Kf_StockInRequestBillToErp " + HSourceInterID + "," + HSourceBillNo;
            //                ds = oCn.RunProcReturn(sql, "h_p_Kf_StockInRequestBillToErp");

                            if (ds == null || ds.Tables[0].Rows.Count == 0)
                            {
                                oCn.RollBack();
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "webapi入库申请单同步，获取信息失败";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                            else
                            {
                                JObject model = new JObject();
                                model.Add("FBillType", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["FBillType"]) }); //单据类型
                                model.Add("FDate", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["日期"])); //单据日期                   
                                model.Add("FStockOrgId", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["库存组织代码"]) }); //库存组织代码
                                model.Add("FBillNo", HSourceBillNo); //单据号
                                model.Add("FStockDirect", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["库存方向"])); //库存方向                   
                                model.Add("FDEPTID", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["部门代码"]) }); //生产车间
                                model.Add("F_paez_Text", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["入库码单"])); //入库码单              
                                model.Add("F_paez_Integer2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["筒子数"])); //筒子数              
                                model.Add("F_paez_Integer1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["筒管只数"])); //筒管只数            
                                model.Add("F_paez_Integer3", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["定长"])); //定长              
                                model.Add("F_paez_BaseProperty4", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["筒重"])); //筒重              
                                model.Add("F_paez_Base", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["工号"])); //工号              
                                model.Add("F_paez_Combo", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["班次代码"])); //班次              
                                model.Add("F_paez_BaseProperty1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["批号"])); //批号              
                                model.Add("F_paez_Integer", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["箱数"])); //箱数              
                                model.Add("F_paez_Decimal2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["总重"])); //总重              
                                model.Add("F_paez_BaseProperty2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["成品编码"])); //成品编码              
                                model.Add("F_paez_BaseProperty5", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["品名"])); //品名              
                                model.Add("F_paez_Base1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["线号"])); //线号              
            //                if (ds == null || ds.Tables[0].Rows.Count == 0)
            //                {
            //                    oCn.RollBack();
            //                    objJsonResult.code = "0";
            //                    objJsonResult.count = 0;
            //                    objJsonResult.Message = "webapi入库申请单同步，获取信息失败";
            //                    objJsonResult.data = null;
            //                    return objJsonResult;
            //                }
            //                else
            //                {
            //                    JObject model = new JObject();
            //                    //model.Add("FBillType", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["FBillType"]) }); //单据类型
            //                    model.Add("FDate", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["日期"])); //单据日期                   
            //                    model.Add("FStockOrgId", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["库存组织代码"]) }); //库存组织代码
            //                    model.Add("FBillNo", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["单据号"])); //单据号
            //                    model.Add("FStockDirect", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["库存方向"])); //库存方向                   
            //                    model.Add("FDEPTID", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["部门代码"]) }); //生产车间
            //                    model.Add("F_paez_Text", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["入库码单"])); //入库码单              
            //                    model.Add("F_paez_Integer2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["筒子数"])); //筒子数              
            //                    model.Add("F_paez_Integer1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["筒管只数"])); //筒管只数            
            //                    model.Add("F_paez_Integer3", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["定长"])); //定长              
            //                    //model.Add("F_paez_BaseProperty4", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["筒重"])); //筒重              
            //                    model.Add("F_paez_Base", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["工号"])); //工号              
            //                    model.Add("F_paez_Combo", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["班次代码"])); //班次              
            //                    //model.Add("F_paez_BaseProperty1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["批号"])); //批号              
            //                    model.Add("F_paez_Integer", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["箱数"])); //箱数              
            //                    model.Add("F_paez_Decimal2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["总重"])); //总重              
            //                    //model.Add("F_paez_BaseProperty2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["成品编码"])); //成品编码              
            //                    //model.Add("F_paez_BaseProperty5", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["品名"])); //品名              
            //                    model.Add("F_paez_Base1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["线号"])); //线号              

                                model.Add("F_paez_BaseProperty", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["机台"])); //机台              
                                model.Add("F_paez_Decimal", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["箱重"])); //箱重              
                                //model.Add("F_WJUK_Text", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["来源"])); //来源              
                                model.Add("FDEPTID1", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["部门代码"]) });//部门       
                                model.Add("F_paez_BaseProperty6", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["捻向"])); //捻向              
                                model.Add("F_paez_BaseProperty7", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["管色"])); //管色              
                                model.Add("F_paez_Assistant", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["等级"])); //等级              
                                model.Add("F_paez_Text11", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["最小箱号"])); //最小箱号              
                                //model.Add("F_paez_Text3", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["文本"])); //文本              
                                model.Add("F_paez_Text4", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["最大箱号"])); //最大箱号              
                                //model.Add("F_paez_PrintTimes", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["打印次数"])); //打印次数              
                                //model.Add("F_paez_Text5", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["线号"])); //条码打印              
                                model.Add("F_paez_BaseProperty10", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["部门代码"]) }); //生产部门              
                                model.Add("F_paez_Combo1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["是否内外贸"])); //是否内外贸              
                                model.Add("F_paez_Combo2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["产品类型"])); //产品类型              
                                model.Add("F_paez_Combo3", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["满版状态"])); //满版状态              
                                model.Add("F_paez_BaseProperty11", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["规格型号"])); //规格型号              
                                model.Add("F_paez_BaseProperty12", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["网别"])); //网别              
                                model.Add("F_TFKO_Text4", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["箱号前缀"])); //箱号前缀              
                                model.Add("F_paez_WB", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["网别"])); //网别1              
            //                    //model.Add("F_paez_BaseProperty", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["机台"])); //机台              
            //                    model.Add("F_paez_Decimal", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["箱重"])); //箱重              
            //                    //model.Add("F_WJUK_Text", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["来源"])); //来源              
            //                    model.Add("FDEPTID1", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["部门代码"]) });//部门       
            //                    //model.Add("F_paez_BaseProperty6", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["捻向"])); //捻向              
            //                    //model.Add("F_paez_BaseProperty7", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["管色"])); //管色              
            //                    model.Add("F_paez_Assistant", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["等级"])); //等级              
            //                    model.Add("F_paez_Text11", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["最小箱号"])); //最小箱号              
            //                    //model.Add("F_paez_Text3", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["文本"])); //文本              
            //                    model.Add("F_paez_Text4", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["最大箱号"])); //最大箱号              
            //                    //model.Add("F_paez_PrintTimes", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["打印次数"])); //打印次数              
            //                    //model.Add("F_paez_Text5", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["线号"])); //条码打印              
            //                    //model.Add("F_paez_BaseProperty10", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["部门代码"]) }); //生产部门              
            //                    model.Add("F_paez_Combo1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["是否内外贸"])); //是否内外贸              
            //                    model.Add("F_paez_Combo2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["产品类型"])); //产品类型              
            //                    model.Add("F_paez_Combo3", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["满版状态"])); //满版状态              
            //                    //model.Add("F_paez_BaseProperty11", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["规格型号"])); //规格型号              
            //                    //model.Add("F_paez_BaseProperty12", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["网别"])); //网别              
            //                    //model.Add("F_TFKO_Text4", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["箱号前缀"])); //箱号前缀              
            //                    model.Add("F_paez_WB", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["网别"])); //网别1              


                                JArray Fentity = new JArray();
                                foreach (DataRow item in ds.Tables[1].Rows)
                                {
                                    JObject FentityModel = new JObject();
                                    FentityModel.Add("FSrcEntryId", item["FSRCENTRYID"].ToString());//  æºå•åˆ†å½•å†…码、
                                    FentityModel.Add("FIsNew", item["FIsNew"].ToString());//  æºå•ç±»åž‹ 
                                    FentityModel.Add("FMaterialId", new JObject() { ["FNumber"] = item["FMaterialId"].ToString() }); // ç‰©æ–™ç¼–码 
                                    FentityModel.Add("FREPORTTYPE", new JObject() { ["FNumber"] = item["FREPORTTYPE"].ToString() });  // ç”Ÿäº§æ±‡æŠ¥ç±»åž‹
                                    FentityModel.Add("FProductType", item["FPRODUCTTYPE"].ToString());//      äº§å“ç±»åž‹
                                    FentityModel.Add("FUNITID", new JObject() { ["FNumber"] = item["FUNITID"].ToString() });//单位
                                    FentityModel.Add("FWORKSHIPID", new JObject() { ["FNumber"] = item["FWORKSHOPID"].ToString() });//生产车间
                                    FentityModel.Add("FMTONO", item["FMTONO"].ToString());//   è®¡åˆ’跟踪号
                                    FentityModel.Add("FCheckProduct", item["FCheckProduct"].ToString());//   äº§å“æ£€éªŒ
                                    FentityModel.Add("FISENTRUST", item["FISENTRUST"].ToString());//       ç»„织委托加工
                                    FentityModel.Add("FSrcBillType", item["FSRCBILLTYPE"].ToString());//   æºå•ç±»åž‹
                                    FentityModel.Add("FMOBILLNO", item["FMOBILLNO"].ToString());//  ç”Ÿäº§è®¢å•
                                    FentityModel.Add("FSrcBillNo", item["FSrcBillNo"].ToString());//   æºå•ç¼–号
                                    FentityModel.Add("FMoEntrySeq", item["FMoEntrySeq"].ToString());//生产订单行号
                                    FentityModel.Add("FPROJECTNO", item["FPROJECTNO"].ToString());//  é¡¹ç›®ç¼–号
                                    FentityModel.Add("FSTDMANHOUR", item["FSTDMANHOUR"].ToString());//  å•ä½æ ‡å‡†å·¥æ—¶
                                    FentityModel.Add("FHRPREPARETIME", item["FHRPREPARETIME"].ToString());//  äººå‘˜å‡†å¤‡å·¥æ—¶
                                    FentityModel.Add("FMACPREPARETIME", item["FMACPREPARETIME"].ToString());//  æœºå™¨å‡†å¤‡å·¥æ—¶
                                    FentityModel.Add("FSrcInterId", item["FSrcInterId"].ToString());//  æºå•å†…码
                                    FentityModel.Add("FSrcEntrySeq", item["FSrcEntrySeq"].ToString());//  æºå•è¡Œå·
                                    FentityModel.Add("FMoId", item["FMoId"].ToString());//生产订单内码
                                    FentityModel.Add("FMoEntryId", item["FMoEntryId"].ToString());//生产订单分录号
                                    FentityModel.Add("FBaseUnitID", new JObject() { ["FNumber"] = item["FBaseUnitID"].ToString() });//单位
                                    FentityModel.Add("FSTOCKINORGID", new JObject() { ["FNumber"] = item["FSTOCKINORGID"].ToString() });//入库组织
                                    FentityModel.Add("FOwnerTypeId", item["FOwnerTypeId"].ToString());// è´§ä¸»ç±»åž‹
                                    FentityModel.Add("FOwnerId", new JObject() { ["FNumber"] = item["FOwnerId"].ToString() });// è´§ä¸»
                                    FentityModel.Add("FSTOCKID", new JObject() { ["FNumber"] = item["FSTOCKID"].ToString() });//仓库
                                    FentityModel.Add("FCostRate", item["FCOSTRATE"].ToString());//     æˆæœ¬æƒé‡
                                    FentityModel.Add("FSNUNITID", new JObject() { ["FNumber"] = item["FSNUNITID"].ToString() });//序列号单位
                                    FentityModel.Add("FISBACKFLUSH", item["FISBACKFLUSH"].ToString());//  å€’冲领料
                                    FentityModel.Add("FMOMAINENTRYID", item["FMOMAINENTRYID"].ToString());// ç”Ÿäº§è®¢å•ä¸»äº§å“åˆ†å½•
                                    FentityModel.Add("FQAIP", item["FQAIP"].ToString());//紧急放行
                                    FentityModel.Add("FREQSRC", item["FREQSRC"].ToString());//需求来源
                                    FentityModel.Add("FREQBILLNO", item["FREQBILLNO"].ToString());//需求单据
                                    FentityModel.Add("FREQBILLID", item["FREQBILLID"].ToString());// éœ€æ±‚单据内码
                                    FentityModel.Add("FREQENTRYSEQ", item["FREQENTRYSEQ"].ToString());//需求单据行号
                                    FentityModel.Add("FREQENTRYID", item["FREQENTRYID"].ToString());// éœ€æ±‚单据分录内码
                                    FentityModel.Add("FBASEQUAQTY", item["FBASEQUAQTY"].ToString());// åŸºæœ¬å•ä½åˆæ ¼æ•°é‡
                                    FentityModel.Add("FQUAQTY", item["FQUAQTY"].ToString());//合格数量
                                    FentityModel.Add("FFailQty", item["FFailQty"].ToString());//不合格数量
                                    FentityModel.Add("FScrapQty", item["FScrapQty"].ToString());//报废数量
                                    FentityModel.Add("FBASEFINISHQTY", item["FBASEFINISHQTY"].ToString());//基本单位完成数量
                                    FentityModel.Add("FFINISHQTY", item["FFINISHQTY"].ToString());//完成数量
                                    FentityModel.Add("FLot", new JObject() { ["FNumber"] = item["FLot"].ToString() });//批号                                   
                                    FentityModel.Add("FBOMID", new JObject() { ["FNumber"] = item["FBOMID"].ToString() });// BOM版本
            //                    JArray Fentity = new JArray();
            //                    foreach (DataRow item in ds.Tables[1].Rows)
            //                    {
            //                        JObject FentityModel = new JObject();
            //                        FentityModel.Add("FMATERIALID", new JObject() { ["FNumber"] = item["物料代码"].ToString() }); // ç‰©æ–™ä»£ç 
            //                        FentityModel.Add("FUnitID", new JObject() { ["FNumber"] = item["计量单位代码"].ToString() });  // å•ä½ä»£ç 
            //                        FentityModel.Add("FQty", item["净重"].ToString()); //净重
            //                        FentityModel.Add("FBASEUNITID", new JObject() { ["FNumber"] = item["基本计量单位代码"].ToString() });  // åŸºæœ¬å•ä½ä»£ç 
            //                        FentityModel.Add("FBASEQTY", item["实收数量"].ToString()); //实收数量
            //                        FentityModel.Add("FSecUNITID", new JObject() { ["FNumber"] = item["库存辅计量单位代码"].ToString() });  // åº“存辅计量单位代码
            //                        FentityModel.Add("FSecQTY", item["库存辅单位实收数量"].ToString()); //实收数量（库存辅单位）
            //                        FentityModel.Add("FOWNERTYPEID", item["货主类型"].ToString()); //货主类型
            //                        FentityModel.Add("FOWNERID", new JObject() { ["FNumber"] = item["货主代码"].ToString() });  // è´§ä¸»ä»£ç 
            //                        FentityModel.Add("FKEEPERTYPEID", item["保管者类型"].ToString()); //保管者类型
            //                        FentityModel.Add("FKEEPERID", new JObject() { ["FNumber"] = item["保管者代码"].ToString() });  // ä¿ç®¡è€…代码
            //                        FentityModel.Add("FAuxPropId", new JObject() { ["FAUXPROPID__FF100003"] = new JObject() { ["FNumber"] = item["辅助属性代码"].ToString() } } );  // è¾…助属性
            //                        FentityModel.Add("FExtAuxUnitId", new JObject() { ["FNumber"] = item["辅计量单位代码"].ToString() });  // è¾…计量单位代码
            //                        FentityModel.Add("FExtAuxUnitQty", item["箱数"].ToString()); //箱数
            //                        FentityModel.Add("F_TFKO_Assistant", new JObject() { ["FNumber"] = item["网别代码"].ToString() });  // ç½‘别
            //                        FentityModel.Add("F_TFKO_Assistant1", new JObject() { ["FNumber"] = item["孔型代码"].ToString() });  // å­”åž‹
            //                        FentityModel.Add("F_TFKO_Assistant2", new JObject() { ["FNumber"] = item["色泽代码"].ToString() });  // è‰²æ³½
            //                        FentityModel.Add("F_TFKO_Assistant3", new JObject() { ["FNumber"] = item["纤度代码"].ToString() });  // çº¤åº¦
            //                        FentityModel.Add("F_paez_Qty", item["毛重"].ToString()); //毛重
            //                        FentityModel.Add("F_TFKO_Text1", item["管色"].ToString()); //管色
            //                        FentityModel.Add("F_TFKO_Text2", item["捻向"].ToString()); //捻向
            //                        FentityModel.Add("FBoxcode", item["箱号"].ToString()); //箱号
            //                        FentityModel.Add("F_PAEZ_SQSL", item["申请单数量"].ToString()); //申请单数量
            //                        FentityModel.Add("F_paez_Integer4", item["筒子数"].ToString()); //筒子数
            //                        FentityModel.Add("F_paez_BaseQty", item["实发数量"].ToString()); //实发数量
            //                        FentityModel.Add("F_paez_Qty1", item["实收数量"].ToString()); //实收数量
            //                        FentityModel.Add("F_paez_Text2", item["箱号"].ToString()); //箱号

                                    JArray Fentity2 = new JArray();
                                    JObject FentityModel2 = new JObject();
                                    FentityModel2.Add("FEntity_Link_FFlowId", item["FEntity_Link_FFlowId"].ToString());
                                    FentityModel2.Add("FEntity_Link_FFlowLineId", item["FEntity_Link_FFlowLineId"].ToString());
                                    FentityModel2.Add("FEntity_Link_FRuleId", item["FEntity_Link_FRuleId"].ToString());
                                    FentityModel2.Add("FEntity_Link_FSTableName", item["FEntity_Link_FSTableName"].ToString());
                                    FentityModel2.Add("FEntity_Link_FSBillId", item["FEntity_Link_FSBillId"].ToString());
                                    FentityModel2.Add("FEntity_Link_FSId", item["FEntity_Link_FSId"].ToString());
                                    Fentity2.Add(FentityModel2);
                                    FentityModel.Add("FEntity_Link", Fentity2);
                                    FentityModel.Add("FBFLowId", new JObject() { ["FID"] = item["FBFLOWID"].ToString() });
                                    Fentity.Add(FentityModel);
                                }
                                model.Add("FEntity", Fentity); //明细信息                       
                                JObject jsonRoot = new JObject()
                                {
                                    ["Creator"] = "",
                                    ["NeedUpDateFields"] = new JArray(),
                                    ["NeedReturnFields"] = new JArray(),
                                    //["IsDeleteEntry"] = "true",
                                    //["SubSystemId"] = "",
                                    //["IsVerifyBaseDataField"] = "false",
                                    ["IsDeleteEntry"] = "true",
                                    ["SubSystemId"] = "",
                                    ["IsVerifyBaseDataField"] = "true",
                                    ["IsEntryBatchFill"] = "false",
                                    ["ValidateFlag"] = "true",
                                    ["NumberSearch"] = "true",
                                    ["IsAutoAdjustField"] = "false",
                                    ["InterationFlags"] = "",
                                    ["IgnoreInterationFlag"] = "",
                                    //["IsAutoSubmitAndAudit"] = true,//自动调用提交和审核功能
                                    ["Model"] = model
                                };

                                //从配置文件获取 CLOUD网址、账套信息、登录用户、登录密码
                                if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
                                {
                                    oCn.RollBack();
                                    objJsonResult.code = "0";
                                    objJsonResult.count = 0;
                                    objJsonResult.Message = "入库申请单同步获取登录账号密码失败！";
                                    objJsonResult.data = null;
                                    return objJsonResult;
                                }
            //                        //JArray Fentity2 = new JArray();
            //                        //JObject FentityModel2 = new JObject();
            //                        //FentityModel2.Add("FEntity_Link_FFlowId", item["FEntity_Link_FFlowId"].ToString());
            //                        //FentityModel2.Add("FEntity_Link_FFlowLineId", item["FEntity_Link_FFlowLineId"].ToString());
            //                        //FentityModel2.Add("FEntity_Link_FRuleId", item["FEntity_Link_FRuleId"].ToString());
            //                        //FentityModel2.Add("FEntity_Link_FSTableName", item["FEntity_Link_FSTableName"].ToString());
            //                        //FentityModel2.Add("FEntity_Link_FSBillId", item["FEntity_Link_FSBillId"].ToString());
            //                        //FentityModel2.Add("FEntity_Link_FSId", item["FEntity_Link_FSId"].ToString());
            //                        //Fentity2.Add(FentityModel2);
            //                        //FentityModel.Add("FEntity_Link", Fentity2);
            //                        //FentityModel.Add("FBFLowId", new JObject() { ["FID"] = item["FBFLOWID"].ToString() });
            //                        Fentity.Add(FentityModel);
            //                    }
            //                    model.Add("FEntity", Fentity); //明细信息                       
            //                    JObject jsonRoot = new JObject()
            //                    {
            //                        ["Creator"] = "",
            //                        ["NeedUpDateFields"] = new JArray(),
            //                        ["NeedReturnFields"] = new JArray(),
            //                        //["IsDeleteEntry"] = "true",
            //                        //["SubSystemId"] = "",
            //                        //["IsVerifyBaseDataField"] = "false",
            //                        ["IsDeleteEntry"] = "true",
            //                        ["SubSystemId"] = "",
            //                        ["IsVerifyBaseDataField"] = "true",
            //                        ["IsEntryBatchFill"] = "false",
            //                        ["ValidateFlag"] = "true",
            //                        ["NumberSearch"] = "true",
            //                        ["IsAutoAdjustField"] = "false",
            //                        ["InterationFlags"] = "",
            //                        ["IgnoreInterationFlag"] = "",
            //                        //["IsAutoSubmitAndAudit"] = true,//自动调用提交和审核功能
            //                        ["Model"] = model
            //                    };

                                var loginRet = InvokeHelper.Login();
                                var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                                if (isSuccess == 0)
                                {
                                    oCn.RollBack();
                                    objJsonResult.code = "0";
                                    objJsonResult.count = 0;
                                    objJsonResult.Message = "登录金蝶失败！";
                                    objJsonResult.data = null;
                                    return objJsonResult;
                                }
                                else
                                {                                   
                                    string result = InvokeHelper.Save("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot));//保存
            //                    //从配置文件获取 CLOUD网址、账套信息、登录用户、登录密码
            //                    if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
            //                    {
            //                        oCn.RollBack();
            //                        objJsonResult.code = "0";
            //                        objJsonResult.count = 0;
            //                        objJsonResult.Message = "入库申请单同步获取登录账号密码失败！";
            //                        objJsonResult.data = null;
            //                        return objJsonResult;
            //                    }

                                    if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                                    {
                                        LogService.Write(JsonConvert.SerializeObject(jsonRoot));
                                        oCn.RollBack();
                                        objJsonResult.code = "0";
                                        objJsonResult.count = 0;
                                        objJsonResult.Message = "入库申请单同步金蝶云失败！单号:" + HSourceBillNo + result + jsonRoot;
                                        objJsonResult.data = null;
                                        return objJsonResult;
                                    }
            //                    var loginRet = InvokeHelper.Login();
            //                    var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
            //                    if (isSuccess == 0)
            //                    {
            //                        oCn.RollBack();
            //                        objJsonResult.code = "0";
            //                        objJsonResult.count = 0;
            //                        objJsonResult.Message = "登录金蝶失败！";
            //                        objJsonResult.data = null;
            //                        return objJsonResult;
            //                    }
            //                    else
            //                    {                                   
            //                        string result = InvokeHelper.Save("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(jsonRoot));//保存

                                    //提交审核
                                    string result1 = string.Empty;
                                    string result2 = string.Empty;
                                    var fID = JObject.Parse(result)["Result"]["Id"].ToString();
                                    var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
                                    var json = new
                                    {
                                        Ids = fID,
                                    };
                                    if (oSystemParameter.omodel.Sc_ICMOReportBill_AutoCheck == "Y") //系统参数  è‡ªåŠ¨å®¡æ ¸ 
                                    {
                                        result1 = InvokeHelper.Submit("PRD_MORPT", JsonConvert.SerializeObject(json));//提交
                                        result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(json));//审核
            //                        if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
            //                        {
            //                            LogService.Write(JsonConvert.SerializeObject(jsonRoot));
            //                            oCn.RollBack();
            //                            objJsonResult.code = "0";
            //                            objJsonResult.count = 0;
            //                            objJsonResult.Message = "入库申请单同步金蝶云失败！单号:" + HSourceBillNo + result + jsonRoot;
            //                            objJsonResult.data = null;
            //                            return objJsonResult;
            //                        }

                                        if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                                        {
                                            oCn.RollBack();
                                            objJsonResult.code = "0";
                                            objJsonResult.count = 0;
                                            objJsonResult.Message = "入库申请单单号:" + ",提交失败" + result1;
                                            objJsonResult.data = null;
                                            return objJsonResult;
                                        }
            //                        //提交审核
            //                        string result1 = string.Empty;
            //                        string result2 = string.Empty;
            //                        var fID = JObject.Parse(result)["Result"]["Id"].ToString();
            //                        var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
            //                        var json = new
            //                        {
            //                            Ids = fID,
            //                        };
            //                        if (oSystemParameter.omodel.Kf_StockInRequestBill_AutoCheck == "Y") //系统参数  è‡ªåŠ¨å®¡æ ¸ 
            //                        {
            //                            result1 = InvokeHelper.Submit("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(json));//提交
            //                            result2 = InvokeHelper.Audit("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(json));//审核

                                        if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                                        {
                                            oCn.RollBack();
                                            objJsonResult.code = "0";
                                            objJsonResult.count = 0;
                                            objJsonResult.Message = "入库申请单单号:" + ",审核失败" + result2;
                                            objJsonResult.data = null;
                                            return objJsonResult;
                                        }
                                    }
                                }
                            }
                        }
                    }
                }
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "获取系统参数失败！ " + sErrMsg;
                objJsonResult.data = null;
                return objJsonResult;
            }
            //                            if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
            //                            {
            //                                oCn.RollBack();
            //                                objJsonResult.code = "0";
            //                                objJsonResult.count = 0;
            //                                objJsonResult.Message = "入库申请单单号:" + ",提交失败" + result1;
            //                                objJsonResult.data = null;
            //                                return objJsonResult;
            //                            }

            //                            if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
            //                            {
            //                                oCn.RollBack();
            //                                objJsonResult.code = "0";
            //                                objJsonResult.count = 0;
            //                                objJsonResult.Message = "入库申请单单号:" + ",审核失败" + result2;
            //                                objJsonResult.data = null;
            //                                return objJsonResult;
            //                            }
            //                        }
            //                    }
            //                }
            //            }
            //        }
            //    }
            //}
            //else
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 0;
            //    objJsonResult.Message = "获取系统参数失败！ " + sErrMsg;
            //    objJsonResult.data = null;
            //    return objJsonResult;
            //}

            string sExpressNumber = "";
            WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);

 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormBillController.cs

@@ -229,6 +229,7 @@
                        var HMainSourceInterID = list[i]["源单主内码"].ToString();
                        var HMainSourceEntryID = list[i]["源单子内码"].ToString();
                        var HPlanQty = list[i]["计划数量"].ToString();
                        var HEmpID = list[i]["HEmpID"].ToString();

                        LogService.CustomWriteLog("2.05:" + i, DateTime.Now.ToString("yyyy-MM-dd"));

@@ -263,7 +264,7 @@
                            " HOrderNeedQty, HSplitQty, HDayPlanSumQty,HPlanBeginDate," +
                            "HSeOrderBillNo,HICMOBillType,HSourceStockInQty,HLeftPlanQty,HOrderLev,HPreparatDate," +
                            "HMainSourceInterID,HMainSourceEntryID,HICMOInterID_Sec,HICMOEntryID_Sec,HPlanQty" +
                            ",HICMOInterID,HICMOEntryID,HPlanEndDate)values" +
                            ",HICMOInterID,HICMOEntryID,HPlanEndDate,HEmpID)values" +
                            $"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
                            $"'{BillType}',GETDATE(),1,'{user}',getdate(),'{HICMOBillNo}','{HOrderType}'," +
                            $"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HProdORGID == "" ? 0.ToString() : HProdORGID)}," +
@@ -271,7 +272,7 @@
                            $" 0, {(HSplitQty == "" ? 0.ToString() : HSplitQty)}, {(HDayPlanSumQty == "" ? 0.ToString() : HDayPlanSumQty)},'{HPlanBeginDate}'," +
                            $"'{HSeOrderBillNo}','{HICMOBillType}',{(HSourceStockInQty == "" ? 0.ToString() : HSourceStockInQty)},{(HLeftPlanQty == "" ? 0.ToString() : HLeftPlanQty)},'{HOrderLev}',getdate()," +
                            $"{HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HPlanQty}," +
                            $"{HMainSourceInterID},{HMainSourceEntryID},'{HPlanEndDate}')";
                            $"{HMainSourceInterID},{HMainSourceEntryID},'{HPlanEndDate}','{HEmpID}')";

                        //LogService.Write("sql:" + sql);
                        //主表

 WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs

@@ -2956,8 +2956,97 @@
            }
        }
        #endregion
    
        #region è®¾å¤‡ç­¾åˆ°å•æäº¤PDA

        [Route("Sb_CheckEqpRepairWorkBill/SaveSb_EquipRepairSignBill_PDA")]
        [HttpPost]
        public object SaveSb_EquipRepairSignBill_PDA([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();

            string UserName = "";

            ListModels oListModels = new ListModels();
            try
            {
                DLL.ClsSb_EquipRepairSignBill oBill = new DLL.ClsSb_EquipRepairSignBill();
                List<Models.ClsSb_EquipRepairSignBillMain> lsmain = new List<Models.ClsSb_EquipRepairSignBillMain>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  
                lsmain = oListModels.getObjectByJson_Sb_EquipRepairSignBill_PDA(msg2);
                foreach (Models.ClsSb_EquipRepairSignBillMain oItem in lsmain)
                {
                    //单据号是否重复
                    if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据号重复！不允许保存！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                 
                    UserName = oItem.HMaker;  //制单人
                    oItem.HBillType = "3920";
                    oItem.HBillSubType = "3920";                  
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));             
                 
                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！没有单据日期，无法保存！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oBill.omodel = oItem;
                }             
                //保存
                //保存完毕后处理
                bool bResult;
                if (oBill.omodel.HInterID == 0)
                {
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功！";
                    //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败！" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion
             
        #region è®¾å¤‡æ•…éšœ ç™»è®°/记录/验收  å‘送消息
        /// <summary>
        /// å¼‚常反馈 æŽ¥æ”¶,处理,验收单保存发送消息

 WebAPI/Controllers/WebAPIController.cs

@@ -81,6 +81,27 @@
            }
        }


       
        /// <summary>
        /// æ ¹æ®æ—¶é—´èŽ·å–产量汇报单集合
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetICMOBillWorkQtyStatus_Tmp")]
        [HttpGet]
        public object GetICMOBillWorkQtyStatus_Tmp()
        {
            DataSet ds = new DataSet();
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            ds = oCN.RunProcReturn("exec h_p_Sc_TodayWorkQtySumReport", "h_p_Sc_TodayWorkQtySumReport");
            objjson.code = "1";
            objjson.count = 1;
            objjson.Message = "Sucess！";
            objjson.data = ds.Tables[0];
            return objjson;

        }

        [Route("Web/GetMAXNumPDA")]
        [HttpGet]
        public object GetMAXNumPDA(string HBillType)
@@ -7767,6 +7788,19 @@
            }
        }

        /// <summary>
        /// å·¥è‰ºå“å‚数分类获取信息
        /// </summary>
        /// <returns></returns>
        [Route("GetGy_TechnologyTypeDetail")]
        [HttpGet]
        public ApiResult<DataSet> GetGy_TechnologyType(string HID)
        {
            var model = LuBaoSevice.GetGy_TechnologyType(HID);
            return model;
        }


        #endregion

        #region  å®¢æˆ·åˆ†ç±»  è®¾ç½®åˆ—表/保存/编辑/删除方法
@@ -13059,6 +13093,9 @@
                    case "YS":
                        HView = "h_v_Sb_EquipRepairCheckBillList";
                        break;
                    case "QD":
                        HView = "h_v_Sb_EquipRepairSignBillList";
                        break;
                    default:
                        objjson.code = "0";
                        objjson.count = 0;

 WebAPI/Controllers/Æ·ÖʹÜÀí/ÖÊÁ¿±¨±í/QC_QualityReportsController.cs

@@ -742,7 +742,7 @@
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillList '" + HProcExchBillNo + "','" + HProcName + "','" + HTechParamName + "',"+HEquipName, "h_p_SB_EquipICMOTechParamBillList");
                ds = oCN.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillList '" + HProcExchBillNo + "','" + HProcName + "','" + HTechParamName + "','"+HEquipName+"'", "h_p_SB_EquipICMOTechParamBillList");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)

 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_SOPBillListController.cs

@@ -82,6 +82,71 @@
            }
        }
        #endregion

        /// <summary>
        /// ä½œä¸šæŒ‡å¯¼ä¹¦åˆ é™¤
        /// </summary>
        /// <returns></returns>
        [Route("Gy_SOPBill/Del")]
        [HttpGet]
        public object Del(string hmainid, string hsubid, string user)
        {
            DataSet ds;
            try
            {
                //删除权限
                if (!DBUtility.ClsPub.Security_Log("Gy_SOPBill_Drop", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (string.IsNullOrWhiteSpace(hmainid))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "资料内码为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.BeginTran();//开始事务
                ds = oCN.RunProcReturn("select * from Gy_SOPBillSub where HInterID=" + hmainid + " and HEntryID=" + hsubid, "Gy_SOPBillSub");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有数据，无法删除！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }

                oCN.RunProc("delete Gy_SOPBillSub where HInterID=" + hmainid + " and HEntryID=" + hsubid);
                oCN.RunProc("delete Gy_SOPBillSub2 where HInterID=" + hmainid + " and HEntryID=" + hsubid);
                oCN.Commit();//提交事务

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "作业指导书删除成功！";
                objJsonResult.data = null;
                return objJsonResult; ;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #region å¼•å‡º
        [Route("Gy_SOPBill/SetExcel")]
        [HttpGet]
@@ -207,7 +272,6 @@
            return response;
        }
        #endregion


        //
        private Int32 Fun_GetCol(string sCol)

 WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs

@@ -4286,9 +4286,9 @@
        /// ç‰©æ–™æ¡ç æ–‡æœ¬æ¡† è°ƒæ‹¨æ‰«ç è°ƒç”¨  20240222
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/get_BarCode_MoveStock_Json")]
        [Route("WEBSController/get_BarCode_MoveStock_New_Json")]
        [HttpGet]
        public Object get_BarCode_MoveStock_Json(string sBarCode, Int64 HInterID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Int64 HSCWHID, Int64 HSCSPID, Double HQty, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HStockInOrgID, Int64 HStockOutOrgID, string HScanStyle, string HCustom1, string HCustom2)
        public Object get_BarCode_MoveStock_New_Json(string sBarCode, Int64 HInterID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Int64 HSCWHID, Int64 HSCSPID, Double HQty, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HStockInOrgID, Int64 HStockOutOrgID, string HScanStyle, string HCustom1, string HCustom2)
        {
            string sErrMsg = "";
            string sJXCode = "";

 WebAPI/DLL/ClsGy_Material_Ctl.cs

@@ -28,7 +28,7 @@
                    ",HSALEUNITID,HSALEPRICEUNITID,HBASEUNITID,HSTOREUNITID,HCHECKINCOMING,HCHECKPRODUCT,HPERUNITSTANDHOUR" +
                    ",HSTDLABORPREPARETIME,HSTDMACHINEPREPARETIME,HWidth,HWeight,HColorRemark,HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol" +
                    ",HMaterRuleType,HColorNo,HPieceMaxQty,HCommonUseFlag,HAvgStockPrice,HFootPrice,HTaxCost,HNoTaxCost,HOnceRightRate" +
                    ",HHeight_M,HInches_M,HAl1Long_M,HDensity_M,HTela_M,HUnderTela_M,HSizing_M,HQtyDec,HPriceDec,HMoneyDec" +
                    ",HHeight_M,HInches_M,HAl1Long_M,HDensity_M,HTela_M,HUnderTela_M,HSizing_M,HQtyDec,HPriceDec,HMoneyDec,HTaxRate,HProfitRate" +
                    ") " +
                    " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                    ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
@@ -48,7 +48,9 @@
                       ",'" + oModel.HSizing_M + "'" +
                       "," + oModel.HQtyDec +
                       "," + oModel.HPriceDec +
                       "," + oModel.HMoneyDec + 
                       "," + oModel.HMoneyDec +
                       "," + oModel.HTaxRate +
                       "," + oModel.HProfitRate +
                       ")", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -215,6 +217,8 @@
                    ",HQtyDec=" + oModel.HQtyDec.ToString() +
                    ",HPriceDec=" + oModel.HPriceDec.ToString() +
                    ",HMoneyDec=" + oModel.HMoneyDec.ToString() +
                    ",HTaxRate=" + oModel.HTaxRate.ToString() +
                    ",HProfitRate=" + oModel.HProfitRate.ToString() +
                    " Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);

 WebAPI/DLL/ClsSb_EquipRepairSignBill.cs

New file
@@ -0,0 +1,252 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Data;

namespace WebAPI.DLL
{
    public class ClsSb_EquipRepairSignBill : DBUtility.ClsXt_BaseBill
    {
        public Models.ClsSb_EquipRepairSignBillMain omodel = new Models.ClsSb_EquipRepairSignBillMain();
        public List<Models.ClsSb_EquipRepairSignBillSub> DetailColl = new List<Models.ClsSb_EquipRepairSignBillSub>();

        public ClsSb_EquipRepairSignBill()
        {
            base.MvarItemKeySub = "Sb_EquipRepairSignBillSub";
            base.MvarItemKeySub2 = "";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey = "Sb_EquipRepairSignBillMain";
            base.MvarReportTitle = "设备维修签到单";
            base.BillType = "3920";
            base.HBillSubType = "3920";

        }

        #region å›ºå®šä»£ç 

        ~ClsSb_EquipRepairSignBill()
        {
            DetailColl = null;
        }

        #endregion   è‡ªå®šä¹‰æ–¹æ³•
        //修改单据
        public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {

                //保存前控制=========================================
                string HBillNote = "";
                DataSet ds = oCn.RunProcReturn("Exec h_p_Sb_EquipRepairSignBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Sb_EquipRepairSignBill_BeforeSaveCtrl");
                if (ds == null)
                {
                    sReturn = "保存前判断失败！";
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    sReturn = "保存失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                    return false;
                }
                //=========================================================

                oCn.BeginTran();
                //更新主表
                oCn.RunProc("UpDate Sb_EquipRepairSignBillMain set  " +
                " HBillNo='" + omodel.HBillNo + "'" +  //固定赋值===============
                //",HDate='" + omodel.HDate + "'" +
                ",HYear='" + omodel.HYear.ToString() + "'" +
                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                ",HRemark='" + omodel.HRemark + "'" +
                  ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
                 ",HMainSourceBillNo='" + omodel.HMainSourceBillNo + "'" +
                ",HMainSourceBillType=" + omodel.HMainSourceBillType +
                 ",HMainSourceEntryID='" + omodel.HMainSourceEntryID.ToString() + "'" +
                ",HMainSourceInterID=" + omodel.HMainSourceInterID.ToString() +
                ",HUpDateDate=getdate()" +
                //========================================
                 ",HDeptID='" + omodel.HDeptID + "'" +
                ",HEquipID=" + omodel.HEquipID.ToString() +
                ",HSignEmpID='" + omodel.HSignEmpID + "'" +
                 ",HSignNote='" + omodel.HSignNote + "'" +
                ",HSignDate='" + omodel.HSignDate + "'" +
                ",HEquipConkBookBillNo='" + omodel.HEquipConkBookBillNo + "'" +
                ",HEquipConkBookInterID=" + omodel.HEquipConkBookInterID +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
                //删除子表
                DeleteBillSub(lngBillKey);

                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sb_EquipRepairSignBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Sb_EquipRepairSignBill_AfterSaveCtrl");
                if (ds2 == null)
                {
                    sReturn = "保存后控制判断失败！";
                    oCn.RollBack();
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    sReturn = "保存失败2！" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
                    oCn.RollBack();
                    return false;
                }
                //============================


                sReturn = "修改单据成功！";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
        //新增单据
        public override bool AddBill(ref string sReturn)
        {
            try
            {
                //得到mainid
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);

                //保存前控制=========================================
                string HBillNote = "";
                DataSet ds = oCn.RunProcReturn("Exec h_p_Sb_EquipRepairSignBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Sb_EquipRepairSignBill_BeforeSaveCtrl");
                if (ds == null)
                {
                    sReturn = "保存前判断失败！";
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    sReturn = "保存失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                    return false;
                }
                //=========================================================


                //若MAINDI重复则重新获取
                oCn.BeginTran();
                //主表
                oCn.RunProc("Insert Into Sb_EquipRepairSignBillMain " +
                 "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
                 ",HYear,HPeriod,HRemark,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
                 ",HDeptID,HEquipID,HSignEmpID,HSignNote,HSignDate,HEquipConkBookBillNo,HEquipConkBookInterID" +
                 ") " +
                 " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                 "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
                 ",'" + omodel.HMainSourceInterID.ToString() + "','" + omodel.HMainSourceEntryID.ToString() + "','" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceBillType.ToString() + "','" + omodel.HDeptID.ToString() + "','" + omodel.HEquipID.ToString() + "','" + omodel.HSignEmpID.ToString() +
                 "','" + omodel.HSignNote + "',getdate(),'" + omodel.HEquipConkBookBillNo.ToString() + "','" + omodel.HEquipConkBookInterID.ToString() + "') ");

                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sb_EquipRepairSignBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Sb_EquipRepairSignBill_AfterSaveCtrl");
                if (ds2 == null)
                {
                    sReturn = "保存后控制判断失败！";
                    oCn.RollBack();
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    sReturn = "保存失败2！" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
                    oCn.RollBack();
                    return false;
                }
                //============================

                sReturn = "新增单据成功！";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
        //显示单据
        public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                //查询主表
                DataSet Ds;
                Ds = oCn.RunProcReturn("Select * from Sb_EquipRepairSignBillMain Where HInterID=" + lngBillKey.ToString(), "Sb_EquipRepairSignBillMain");
                if (Ds.Tables[0].Rows.Count == 0)
                {
                    sReturn = "单据未找到！";
                    return false;
                }
                //固定赋值===========================================
                omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
                omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
                omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
                omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
                omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
                omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
                omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
                omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
                omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
                omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
                omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
                omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
                omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
                omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
                omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
                omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
                omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
                omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
                omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
                omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
                omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
                omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
                omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
                omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
                //========================================================


                //循环
                DataSet DsSub;
                DsSub = oCn.RunProcReturn("Select * from Sb_EquipRepairSignBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sb_EquipRepairSignBillSub");
                DetailColl.Clear();//清空
                for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
                {
                    Models.ClsSb_EquipRepairSignBillSub oSub = new Models.ClsSb_EquipRepairSignBillSub();
                    // å›ºå®šèµ‹å€¼===============================================
                    oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
                    oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
                    oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
                    oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
                    oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
                    oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
                    oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
                    oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
                    oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
                    oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
                    oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
                    oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
                    //===================================================                 
                    DetailColl.Add(oSub);
                }
                sReturn = "显示单据成功！";
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                throw (e);
            }
        }


    }

}

 WebAPI/ListModels.cs

@@ -1398,6 +1398,18 @@
            return list;
        }

        /// <summary>
        /// å¤„理设备维修签到单主表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsSb_EquipRepairSignBillMain> getObjectByJson_Sb_EquipRepairSignBill_PDA(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsSb_EquipRepairSignBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipRepairSignBillMain>>(jsonString);
            return list;
        }


        /// <summary>
        /// å¤„理新员工技能清单主表的json

 WebAPI/Models/ClsGy_Material_Model.cs

@@ -101,6 +101,9 @@
        public double HPriceDec; // å•ä»·ç²¾åº¦ï¼ˆé»˜è®¤4）

        public double HMoneyDec; // é‡‘额精度（默认2）
        public double HTaxRate; // é»˜è®¤ç¨ŽçŽ‡ï¼ˆé»˜è®¤13）

        public double HProfitRate; // é»˜è®¤åˆ©æ¶¦çŽ‡ï¼ˆé»˜è®¤0）

    }
}

 WebAPI/Models/ClsSb_EquipRepairSignBillMain.cs

New file
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace WebAPI.Models
{
    public class ClsSb_EquipRepairSignBillMain : DBUtility.ClsXt_BaseBillMain
    {
        public Int64 HDeptID;   // int       --部门(Gy_Department)
        public Int64 HEquipID;  //int --相关设备（Gy_EquipFileBillMain）
        public Int64 HSignEmpID;    // int --签到人（Gy_Employee）
        public string HSignNote;    // varchar(200) --签到确认
        public DateTime HSignDate;  //datetime --签到时间（年月日时分秒）   
        public string HEquipConkBookBillNo;  //varchar(50)  --设备故障登记单号
        public int HEquipConkBookInterID;   // int --设备故障登记单主内码
    }
}

 WebAPI/Models/ClsSb_EquipRepairSignBillSub.cs

New file
@@ -0,0 +1,11 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace WebAPI.Models
{
    public class ClsSb_EquipRepairSignBillSub : DBUtility.ClsXt_BaseBillSub
    { 
        
    }
}

 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -12,37 +12,37 @@
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.EndpointUtil.dll">
      <publishTime>04/07/2020 16:33:48</publishTime>
      <publishTime>04/07/2020 08:33:48</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
      <publishTime>04/25/2023 17:49:04</publishTime>
      <publishTime>04/25/2023 09:49:04</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.GatewaySpi.dll">
      <publishTime>07/31/2024 20:50:30</publishTime>
      <publishTime>07/31/2024 12:50:30</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.OpenApiClient.dll">
      <publishTime>08/06/2024 18:07:52</publishTime>
      <publishTime>08/06/2024 10:07:52</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
      <publishTime>11/22/2022 11:24:18</publishTime>
      <publishTime>11/22/2022 03:24:18</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
      <publishTime>08/08/2024 19:43:22</publishTime>
      <publishTime>08/08/2024 11:43:22</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.TeaUtil.dll">
      <publishTime>07/15/2024 20:25:56</publishTime>
      <publishTime>07/15/2024 12:25:56</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.TeaXML.dll">
      <publishTime>08/03/2022 21:46:08</publishTime>
      <publishTime>08/03/2022 13:46:08</publishTime>
    </File>
    <File Include="bin/Aliyun.Credentials.dll">
      <publishTime>07/24/2024 10:36:58</publishTime>
      <publishTime>07/24/2024 02:36:58</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.dll">
      <publishTime>02/22/2013 16:43:40</publishTime>
      <publishTime>02/22/2013 08:43:40</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.pdb">
      <publishTime>02/22/2013 16:43:40</publishTime>
      <publishTime>02/22/2013 08:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>11/09/2022 16:02:08</publishTime>
@@ -55,7 +55,7 @@
      <publishTime>08/16/2024 09:30:44</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
      <publishTime>12/17/2020 21:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>11/09/2022 16:02:06</publishTime>
@@ -68,7 +68,7 @@
      <publishTime>08/16/2024 09:30:42</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
      <publishTime>07/22/2016 14:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>11/02/2022 22:02:56</publishTime>
@@ -81,34 +81,37 @@
      <publishTime>08/16/2024 09:30:34</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
      <publishTime>03/22/2022 05:17:26</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.pdb">
      <publishTime>03/19/2022 07:39:42</publishTime>
      <publishTime>03/18/2022 23:39:42</publishTime>
    </File>
    <File Include="bin/Grpc.Core.dll">
      <publishTime>03/22/2022 13:17:20</publishTime>
      <publishTime>03/22/2022 05:17:20</publishTime>
    </File>
    <File Include="bin/Grpc.Core.pdb">
      <publishTime>03/19/2022 07:39:48</publishTime>
      <publishTime>03/18/2022 23:39:48</publishTime>
    </File>
    <File Include="bin/grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
      <publishTime>03/22/2022 05:17:22</publishTime>
    </File>
    <File Include="bin/grpc_csharp_ext.x86.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
      <publishTime>03/22/2022 05:17:22</publishTime>
    </File>
    <File Include="bin/ICSharpCode.SharpZipLib.dll">
      <publishTime>05/09/2021 01:08:30</publishTime>
      <publishTime>05/08/2021 17:08:30</publishTime>
    </File>
    <File Include="bin/ICSharpCode.SharpZipLib.pdb">
      <publishTime>05/09/2021 01:08:30</publishTime>
      <publishTime>05/08/2021 17:08:30</publishTime>
    </File>
    <File Include="bin/Interop.gregn6Lib.dll">
      <publishTime>08/25/2021 10:28:25</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
=======
      <publishTime>02/08/2023 09:18:13</publishTime>
>>>>>>> 33ffe895b1862cda181a7fbb5028f81620226087
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
      <publishTime>09/20/2018 19:23:20</publishTime>
@@ -117,19 +120,19 @@
      <publishTime>09/20/2018 19:28:34</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
      <publishTime>03/18/2022 23:38:44</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.so">
      <publishTime>03/19/2022 07:38:42</publishTime>
      <publishTime>03/18/2022 23:38:42</publishTime>
    </File>
    <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
      <publishTime>03/19/2015 01:02:50</publishTime>
      <publishTime>03/18/2015 17:02:50</publishTime>
    </File>
    <File Include="bin/Microsoft.CSharp.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/Microsoft.Web.Infrastructure.dll">
      <publishTime>07/25/2012 19:48:56</publishTime>
      <publishTime>07/25/2012 11:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>11/09/2022 16:02:01</publishTime>
@@ -144,32 +147,36 @@
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>09/05/2022 17:03:10</publishTime>
>>>>>>> 33ffe895b1862cda181a7fbb5028f81620226087
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>03/08/2023 15:09:56</publishTime>
      <publishTime>03/08/2023 07:09:56</publishTime>
    </File>
    <File Include="bin/NPOI.dll">
      <publishTime>10/23/2021 09:07:54</publishTime>
      <publishTime>10/23/2021 01:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.dll">
      <publishTime>10/23/2021 09:07:56</publishTime>
      <publishTime>10/23/2021 01:07:56</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.pdb">
      <publishTime>10/23/2021 17:07:56</publishTime>
      <publishTime>10/23/2021 09:07:56</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXml4Net.dll">
      <publishTime>10/23/2021 09:07:54</publishTime>
      <publishTime>10/23/2021 01:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXml4Net.pdb">
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.dll">
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.dll">
      <publishTime>10/23/2021 01:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.pdb">
      <publishTime>10/23/2021 17:07:54</publishTime>
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.pdb">
      <publishTime>10/23/2021 17:07:54</publishTime>
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>11/09/2022 16:01:56</publishTime>
@@ -192,7 +199,7 @@
      <publishTime>08/16/2024 09:30:33</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
      <publishTime>08/30/2012 22:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>08/16/2024 09:30:33</publishTime>
@@ -206,10 +213,10 @@
      <publishTime>05/09/2021 13:35:37</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
      <publishTime>02/15/2015 17:57:08</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
      <publishTime>07/19/2017 10:01:28</publishTime>
    </File>
    <File Include="bin/System.ComponentModel.DataAnnotations.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -233,25 +240,25 @@
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
      <publishTime>08/19/2014 18:03:34</publishTime>
      <publishTime>08/19/2014 10:03:34</publishTime>
    </File>
    <File Include="bin/System.Memory.dll">
      <publishTime>04/18/2019 00:24:34</publishTime>
      <publishTime>04/17/2019 16:24:34</publishTime>
    </File>
    <File Include="bin/System.Net.Http.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Extensions.dll">
      <publishTime>02/20/2015 04:10:46</publishTime>
      <publishTime>02/19/2015 20:10:46</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Formatting.dll">
      <publishTime>11/28/2018 21:00:36</publishTime>
      <publishTime>11/28/2018 13:00:36</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Primitives.dll">
      <publishTime>02/20/2015 04:10:46</publishTime>
      <publishTime>02/19/2015 20:10:46</publishTime>
    </File>
    <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
      <publishTime>09/19/2018 03:38:10</publishTime>
      <publishTime>09/18/2018 19:38:10</publishTime>
    </File>
    <File Include="bin/System.Runtime.Serialization.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -260,7 +267,7 @@
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.Cors.dll">
      <publishTime>11/28/2018 20:58:44</publishTime>
      <publishTime>11/28/2018 12:58:44</publishTime>
    </File>
    <File Include="bin/System.Web.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -275,37 +282,40 @@
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.Helpers.dll">
      <publishTime>01/28/2015 12:04:30</publishTime>
      <publishTime>01/28/2015 04:04:30</publishTime>
    </File>
    <File Include="bin/System.Web.Http.Cors.dll">
      <publishTime>11/28/2018 21:01:26</publishTime>
      <publishTime>11/28/2018 13:01:26</publishTime>
    </File>
    <File Include="bin/System.Web.Http.dll">
      <publishTime>11/28/2018 21:01:00</publishTime>
      <publishTime>11/28/2018 13:01:00</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
=======
      <publishTime>09/05/2022 17:03:08</publishTime>
>>>>>>> 33ffe895b1862cda181a7fbb5028f81620226087
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 12:02:18</publishTime>
      <publishTime>01/28/2015 04:02:18</publishTime>
    </File>
    <File Include="bin/System.Web.Optimization.dll">
      <publishTime>02/11/2014 23:26:04</publishTime>
      <publishTime>02/11/2014 15:26:04</publishTime>
    </File>
    <File Include="bin/System.Web.Razor.dll">
      <publishTime>01/28/2015 12:02:32</publishTime>
      <publishTime>01/28/2015 04:02:32</publishTime>
    </File>
    <File Include="bin/System.Web.Services.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.Deployment.dll">
      <publishTime>01/28/2015 12:04:30</publishTime>
      <publishTime>01/28/2015 04:04:30</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.dll">
      <publishTime>01/28/2015 12:04:30</publishTime>
      <publishTime>01/28/2015 04:04:30</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.Razor.dll">
      <publishTime>01/28/2015 12:04:30</publishTime>
      <publishTime>01/28/2015 04:04:30</publishTime>
    </File>
    <File Include="bin/System.Xml.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -314,7 +324,7 @@
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/Tea.dll">
      <publishTime>05/09/2023 10:43:40</publishTime>
      <publishTime>05/09/2023 02:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>08/16/2024 09:30:35</publishTime>
@@ -323,7 +333,7 @@
      <publishTime>08/16/2024 09:30:35</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>11/14/2022 11:23:59</publishTime>
@@ -339,13 +349,13 @@
      <publishTime>08/16/2024 09:30:54</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
      <publishTime>07/17/2013 17:03:52</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
      <publishTime>11/29/2018 21:26:02</publishTime>
      <publishTime>11/29/2018 13:26:02</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
      <publishTime>11/29/2018 21:26:30</publishTime>
      <publishTime>11/29/2018 13:26:30</publishTime>
    </File>
    <File Include="Config/kdapi.config">
      <publishTime>04/06/2023 15:57:01</publishTime>
@@ -402,19 +412,22 @@
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
      <publishTime>03/22/2022 05:17:22</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x86.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
      <publishTime>03/22/2022 05:17:22</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>04/06/2023 15:57:02</publishTime>
=======
      <publishTime>09/05/2022 17:03:09</publishTime>
>>>>>>> 33ffe895b1862cda181a7fbb5028f81620226087
    </File>
    <File Include="libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
      <publishTime>03/18/2022 23:38:44</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.so">
      <publishTime>03/19/2022 07:38:42</publishTime>
      <publishTime>03/18/2022 23:38:42</publishTime>
    </File>
    <File Include="libman.json">
      <publishTime>07/12/2023 08:14:21</publishTime>
@@ -532,6 +545,9 @@
    </File>
    <File Include="Web References/WebS/Reference.map">
      <publishTime>05/06/2024 13:47:57</publishTime>
=======
      <publishTime>05/06/2024 08:56:50</publishTime>
>>>>>>> 33ffe895b1862cda181a7fbb5028f81620226087
    </File>
    <File Include="Web References/WebS/WebService1.disco">
      <publishTime>12/20/2021 13:19:56</publishTime>

 WebAPI/Properties/PublishProfiles/FolderProfile19.pubxml.user

@@ -5,14 +5,38 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
    <History>True|2024-08-15T03:05:05.5377207Z;True|2024-08-15T10:51:59.8586373+08:00;True|2024-08-15T09:34:19.6954590+08:00;True|2024-08-15T09:27:30.4910263+08:00;True|2024-08-14T17:10:23.3978810+08:00;True|2024-08-14T17:03:22.1530532+08:00;True|2024-08-14T15:01:12.5015047+08:00;True|2024-08-14T10:54:40.0433008+08:00;True|2024-08-14T10:54:29.3944984+08:00;True|2024-08-14T09:39:23.8085209+08:00;True|2024-08-14T09:23:48.5190887+08:00;True|2024-08-13T14:04:05.8532501+08:00;True|2024-08-13T11:23:40.5242910+08:00;</History>
    <History>True|2024-08-16T02:41:16.1464132Z;True|2024-08-16T09:10:31.5340428+08:00;True|2024-08-15T15:59:59.2769975+08:00;True|2024-08-15T15:59:33.1518421+08:00;True|2024-08-15T13:42:21.6165189+08:00;True|2024-08-15T13:36:09.3131583+08:00;True|2024-08-15T13:19:16.2478692+08:00;True|2024-08-15T11:05:05.5377207+08:00;True|2024-08-15T10:51:59.8586373+08:00;True|2024-08-15T09:34:19.6954590+08:00;True|2024-08-15T09:27:30.4910263+08:00;True|2024-08-14T17:10:23.3978810+08:00;True|2024-08-14T17:03:22.1530532+08:00;True|2024-08-14T15:01:12.5015047+08:00;True|2024-08-14T10:54:40.0433008+08:00;True|2024-08-14T10:54:29.3944984+08:00;True|2024-08-14T09:39:23.8085209+08:00;True|2024-08-14T09:23:48.5190887+08:00;True|2024-08-13T14:04:05.8532501+08:00;True|2024-08-13T11:23:40.5242910+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.EndpointUtil.dll">
      <publishTime>04/07/2020 16:33:48</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
      <publishTime>04/25/2023 17:49:04</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.GatewaySpi.dll">
      <publishTime>07/31/2024 20:50:30</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.OpenApiClient.dll">
      <publishTime>08/06/2024 18:07:52</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
      <publishTime>11/22/2022 11:24:18</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
      <publishTime>08/08/2024 19:43:22</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.TeaUtil.dll">
      <publishTime>07/15/2024 20:25:56</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.TeaXML.dll">
      <publishTime>08/03/2022 21:46:08</publishTime>
    </File>
    <File Include="bin/Aliyun.Credentials.dll">
      <publishTime>12/05/2022 15:40:12</publishTime>
      <publishTime>07/24/2024 10:36:58</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.dll">
      <publishTime>02/22/2013 16:43:40</publishTime>
@@ -21,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>08/15/2024 11:04:55</publishTime>
      <publishTime>08/16/2024 10:40:59</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/15/2024 11:04:55</publishTime>
      <publishTime>08/16/2024 10:40:59</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>08/15/2024 11:04:54</publishTime>
      <publishTime>08/16/2024 10:40:57</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/15/2024 11:04:54</publishTime>
      <publishTime>08/16/2024 10:40:57</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>08/15/2024 11:04:51</publishTime>
      <publishTime>08/16/2024 10:40:52</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/15/2024 11:04:51</publishTime>
      <publishTime>08/16/2024 10:40:52</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -87,16 +111,16 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>08/15/2024 11:04:51</publishTime>
      <publishTime>08/16/2024 10:40:53</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>08/15/2024 11:04:51</publishTime>
      <publishTime>08/16/2024 10:40:53</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>09/07/2014 18:39:38</publishTime>
      <publishTime>03/08/2023 15:09:56</publishTime>
    </File>
    <File Include="bin/NPOI.dll">
      <publishTime>10/23/2021 09:07:54</publishTime>
@@ -123,25 +147,25 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>08/15/2024 11:04:50</publishTime>
      <publishTime>08/16/2024 10:40:51</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>08/15/2024 11:04:50</publishTime>
      <publishTime>08/16/2024 10:40:51</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>08/15/2024 11:04:50</publishTime>
      <publishTime>08/16/2024 10:40:52</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/15/2024 11:04:50</publishTime>
      <publishTime>08/16/2024 10:40:52</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>08/15/2024 11:04:50</publishTime>
      <publishTime>08/16/2024 10:40:52</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/15/2024 11:04:50</publishTime>
      <publishTime>08/16/2024 10:40:52</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
@@ -251,14 +275,23 @@
    <File Include="bin/System.Xml.Linq.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/Tea.dll">
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>08/16/2024 10:40:54</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>08/16/2024 10:40:54</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>08/15/2024 11:04:59</publishTime>
      <publishTime>08/16/2024 10:41:03</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>08/15/2024 11:04:59</publishTime>
      <publishTime>08/16/2024 10:41:03</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -345,7 +378,7 @@
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>06/25/2024 09:50:21</publishTime>
      <publishTime>08/16/2024 09:07:08</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
@@ -453,7 +486,7 @@
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/15/2024 11:05:04</publishTime>
      <publishTime>08/16/2024 10:41:14</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml

New file
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121. 
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <DeleteExistingFiles>False</DeleteExistingFiles>
    <ExcludeApp_Data>False</ExcludeApp_Data>
    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>G:\issWeb\网站发布\API</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
  </PropertyGroup>
</Project>

 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user

New file
@@ -0,0 +1,495 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121. 
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2024-08-16T08:55:32.0918962Z;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
    <_PublishTargetUrl>G:\issWeb\网站发布\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>04/15/2024 12:55:47</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.EndpointUtil.dll">
      <publishTime>04/07/2020 16:33:48</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
      <publishTime>04/25/2023 17:49:04</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.GatewaySpi.dll">
      <publishTime>07/31/2024 20:50:30</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.OpenApiClient.dll">
      <publishTime>08/06/2024 18:07:52</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
      <publishTime>11/22/2022 11:24:18</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
      <publishTime>08/08/2024 19:43:22</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.TeaUtil.dll">
      <publishTime>07/15/2024 20:25:56</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.TeaXML.dll">
      <publishTime>08/03/2022 21:46:08</publishTime>
    </File>
    <File Include="bin/Aliyun.Credentials.dll">
      <publishTime>07/24/2024 10:36:58</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.dll">
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.pdb">
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>08/16/2024 16:55:13</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/16/2024 16:55:13</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>08/16/2024 16:55:11</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/16/2024 16:55:11</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>08/16/2024 16:55:04</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/16/2024 16:55:04</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.pdb">
      <publishTime>03/19/2022 07:39:42</publishTime>
    </File>
    <File Include="bin/Grpc.Core.dll">
      <publishTime>03/22/2022 13:17:20</publishTime>
    </File>
    <File Include="bin/Grpc.Core.pdb">
      <publishTime>03/19/2022 07:39:48</publishTime>
    </File>
    <File Include="bin/grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="bin/grpc_csharp_ext.x86.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="bin/ICSharpCode.SharpZipLib.dll">
      <publishTime>05/09/2021 01:08:30</publishTime>
    </File>
    <File Include="bin/ICSharpCode.SharpZipLib.pdb">
      <publishTime>05/09/2021 01:08:30</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>04/15/2024 12:55:44</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.so">
      <publishTime>03/19/2022 07:38:42</publishTime>
    </File>
    <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
      <publishTime>03/19/2015 01:02:50</publishTime>
    </File>
    <File Include="bin/Microsoft.CSharp.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/Microsoft.Web.Infrastructure.dll">
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>08/16/2024 16:55:06</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>08/16/2024 16:55:06</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/15/2024 12:55:45</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>03/08/2023 15:09:56</publishTime>
    </File>
    <File Include="bin/NPOI.dll">
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.dll">
      <publishTime>10/23/2021 09:07:56</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.pdb">
      <publishTime>10/23/2021 17:07:56</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXml4Net.dll">
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXml4Net.pdb">
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.dll">
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.pdb">
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.pdb">
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>08/16/2024 16:36:26</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>08/16/2024 16:36:26</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>08/16/2024 16:46:45</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/16/2024 16:46:45</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>08/16/2024 16:53:38</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/16/2024 16:53:38</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
    </File>
    <File Include="bin/System.ComponentModel.DataAnnotations.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Configuration.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Data.DataSetExtensions.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Data.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Drawing.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.EnterpriseServices.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
      <publishTime>08/19/2014 18:03:34</publishTime>
    </File>
    <File Include="bin/System.Memory.dll">
      <publishTime>04/18/2019 00:24:34</publishTime>
    </File>
    <File Include="bin/System.Net.Http.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Extensions.dll">
      <publishTime>02/20/2015 04:10:46</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Formatting.dll">
      <publishTime>11/28/2018 21:00:36</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Primitives.dll">
      <publishTime>02/20/2015 04:10:46</publishTime>
    </File>
    <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
      <publishTime>09/19/2018 03:38:10</publishTime>
    </File>
    <File Include="bin/System.Runtime.Serialization.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.ApplicationServices.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.Cors.dll">
      <publishTime>11/28/2018 20:58:44</publishTime>
    </File>
    <File Include="bin/System.Web.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.DynamicData.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.Entity.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.Extensions.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.Helpers.dll">
      <publishTime>01/28/2015 12:04:30</publishTime>
    </File>
    <File Include="bin/System.Web.Http.Cors.dll">
      <publishTime>11/28/2018 21:01:26</publishTime>
    </File>
    <File Include="bin/System.Web.Http.dll">
      <publishTime>11/28/2018 21:01:00</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
      <publishTime>04/15/2024 12:55:45</publishTime>
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 12:02:18</publishTime>
    </File>
    <File Include="bin/System.Web.Optimization.dll">
      <publishTime>02/11/2014 23:26:04</publishTime>
    </File>
    <File Include="bin/System.Web.Razor.dll">
      <publishTime>01/28/2015 12:02:32</publishTime>
    </File>
    <File Include="bin/System.Web.Services.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.Deployment.dll">
      <publishTime>01/28/2015 12:04:30</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.dll">
      <publishTime>01/28/2015 12:04:30</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.Razor.dll">
      <publishTime>01/28/2015 12:04:30</publishTime>
    </File>
    <File Include="bin/System.Xml.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Xml.Linq.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/Tea.dll">
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>08/16/2024 16:35:48</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>08/16/2024 16:35:48</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>08/16/2024 16:55:20</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>08/16/2024 16:55:20</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>08/16/2024 16:55:28</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
      <publishTime>11/29/2018 21:26:02</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
      <publishTime>11/29/2018 21:26:30</publishTime>
    </File>
    <File Include="Config/kdapi.config">
      <publishTime>04/15/2024 12:55:43</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>04/15/2024 12:55:43</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>04/15/2024 12:55:43</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>04/15/2024 12:55:43</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>04/15/2024 12:55:44</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>04/15/2024 12:55:44</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>04/15/2024 12:55:44</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>04/15/2024 12:55:44</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>04/15/2024 12:55:44</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>04/15/2024 12:55:44</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>04/15/2024 12:55:45</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>04/15/2024 12:55:45</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>04/15/2024 12:55:45</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>04/15/2024 12:55:47</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>04/15/2024 12:55:47</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>04/15/2024 12:55:47</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>04/15/2024 12:55:47</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>04/15/2024 12:55:45</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x86.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>04/15/2024 12:55:45</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.so">
      <publishTime>03/19/2022 07:38:42</publishTime>
    </File>
    <File Include="libman.json">
      <publishTime>04/15/2024 12:55:47</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>04/15/2024 12:55:45</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>08/16/2024 08:34:04</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/Reference.map">
      <publishTime>04/29/2024 08:30:03</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/16/2024 16:53:22</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/Service/LuBaoSevice.cs

@@ -807,6 +807,31 @@
                return new ApiResult<DataSet> { code = -1, msg = "不存在客户分类数据" };
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }

        /// <summary>
        ///工艺品参数分类根据id获取信息
        /// </summary>
        public static ApiResult<DataSet> GetGy_TechnologyType(string HID)
        {
            if (string.IsNullOrEmpty(HID))
                return new ApiResult<DataSet> { code = -1, msg = "ID不能为空" };
            var dataSet = GetGy_TechnologyTypeDb(HID);
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "不存在工艺参数分类数据" };
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }

        /// <summary>
        ///工艺品参数分类根据id获取信息调用持久层
        /// </summary>
        public static DataSet GetGy_TechnologyTypeDb(string HID)
        {
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_Technology  where HItemID= " + HID + " ", "h_v_Gy_Technology");
            return dataSet;
        }


        public static DataSet GetGy_CusTypeDb(string HID)
        {
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

 WebAPI/WebAPI.csproj

@@ -279,6 +279,7 @@
    <Content Include="Views\Scripts\bootstrap.min.js" />
    <Content Include="Config\kdapi.config" />
    <Content Include="libman.json" />
    <None Include="Properties\PublishProfiles\FolderProfilewtt.pubxml" />
    <None Include="Properties\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -761,6 +762,7 @@
    <Compile Include="DLL\ClsSb_EquipMaintainRuleBill.cs" />
    <Compile Include="DLL\ClsSb_EquipRepairCheckBill.cs" />
    <Compile Include="DLL\ClsSb_EquipRepairSendWorkBill.cs" />
    <Compile Include="DLL\ClsSb_EquipRepairSignBill.cs" />
    <Compile Include="DLL\ClsSb_EquipRepairWorkBill.cs" />
    <Compile Include="DLL\ClsSb_MouldRepairWorkBill.cs" />
    <Compile Include="DLL\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" />
@@ -794,6 +796,8 @@
    <Compile Include="Models\ClsGy_SupMaterial.cs" />
    <Compile Include="Models\ClsGy_EquipFileBillSub_DotCheckRule.cs" />
    <Compile Include="Models\ClsGy_EquipFileBillSub_MaintainRule.cs" />
    <Compile Include="Models\ClsSb_EquipRepairSignBillMain.cs" />
    <Compile Include="Models\ClsSb_EquipRepairSignBillSub.cs" />
    <Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
    <Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
    <Compile Include="Models\ClsSc_MESBeginWorkBillSub_RelationBill.cs" />

 WebAPI/WebAPI.csproj.user

@@ -18,7 +18,7 @@
    <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
    <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
    <UseGlobalApplicationHostFile />
    <ProjectView>ShowAllFiles</ProjectView>
    <ProjectView>ProjectFiles</ProjectView>
    <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
    <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
  </PropertyGroup>

 sdk_dingding/TopSdk/bin/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Release/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt

@@ -9,3 +9,8 @@
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\智云LMes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\智云LMes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\智云LMes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\智云LMes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\智云LMes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb

 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache

New file
@@ -0,0 +1 @@
eb64bc61f5da8fdd8ad56e04c391e3a377d8ca59

 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt

New file
@@ -0,0 +1,6 @@
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb

 sdk_dingding/TopSdk/obj/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.pdb

Binary files differ