1
duhe
2026-04-07 97ff1f4597468c8fb0fc9ddc7e6cf38c9ebf44ca
1
10个文件已修改
441 ■■■■■ 已修改文件
BLL/BLL.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/生产管理/ClsSc_QualityReportBill.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WarM/条码打印/Gy_BarCodeBill_Rework.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs 183 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Sc_ProcExchWorkBackBillController.cs 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user 138 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BLL/BLL.csproj.user
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
  <PropertyGroup>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectView>ShowAllFiles</ProjectView>
    <PublishUrlHistory />
    <InstallUrlHistory />
    <SupportUrlHistory />
DAL/Éú²ú¹ÜÀí/ClsSc_QualityReportBill.cs
@@ -43,7 +43,7 @@
                //保存前控制=========================================
                string HBillNote = "";
                DataSet ds = oCn.RunProcReturn("Exec h_p_Sc_QualityReportBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Sc_QualityReportBill_BeforeSaveCtrl");
                DataSet ds = oCn.RunProcReturn("Exec h_p_Sc_QualityReportBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',2 ", "h_p_Sc_QualityReportBill_BeforeSaveCtrl");
                if (ds == null)
                {
                    sReturn = "保存前判断失败!";
@@ -130,7 +130,7 @@
                }
                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("h_p_Sc_QualityReportBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Sc_QualityReportBill_AfterSaveCtrl");
                DataSet ds2 = oCn.RunProcReturn("h_p_Sc_QualityReportBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_Sc_QualityReportBill_AfterSaveCtrl");
                if (ds2 == null)
                {
                    sReturn = "保存后控制判断失败!";
WarM/ÌõÂë´òÓ¡/Gy_BarCodeBill_Rework.cs
@@ -702,8 +702,30 @@
                                Int32 HModelLen = grdMain.Rows[j].Cells[HMaterModelCol].Value.ToString().Length;
                                string HModelLeft = HModelLen >= 4 ? grdMain.Rows[j].Cells[HMaterModelCol].Value.ToString() : "";
                                string HSubjoin2 = grdMain.Rows[j].Cells[HSubjoin2Col].Value.ToString();
                                //条码编号 = å·¥åŽ‚ä»£ç ï¼ˆ1) + è½¦é—´ä»£ç ï¼ˆ060113)+ æœºåž‹å· + å¹´ + æœˆ + æ—¥ + æµæ°´å·
                                TM = "1" + "060113" + HSubjoin2 + sYear + sPeriod + sDay + LSH.ToString("D5");
                                //生成物料条码时,机型码不允许为空,如若物料代码前缀不为G或L的,可跳过控制
                                if (oSystemParameter.omodel.Gy_BarCodeBill_Rework_Ctrl != "")
                                {
                                    string[] HMaterNumberPrefix = oSystemParameter.omodel.Gy_BarCodeBill_Rework_Ctrl.Split(',');
                                    char HMaterfirstChar = grdMain.Rows[j].Cells[HMaterNumberCol].Value.ToString()[0];
                                    if (HMaterNumberPrefix.Contains(HMaterfirstChar.ToString()))
                                    {
                                        //条码编号 = å·¥åŽ‚ä»£ç ï¼ˆ1) + è½¦é—´ä»£ç ï¼ˆ060113)+ æœºåž‹å· + å¹´ + æœˆ + æ—¥ + æµæ°´å·
                                        TM = "1" + "060113" + HSubjoin2 + sYear + sPeriod + sDay + LSH.ToString("D5");
                                    }
                                    else
                                    {
                                        //条码编号 = å·¥åŽ‚ä»£ç ï¼ˆ1) + è½¦é—´ä»£ç ï¼ˆ060113)+ ç‰©æ–™ä»£ç é¦–字母 + å¹´ + æœˆ + æ—¥ + æµæ°´å·
                                        TM = "1" + "060113" + HMaterfirstChar.ToString() + sYear + sPeriod + sDay + LSH.ToString("D5");
                                    }
                                }
                                else
                                {
                                    //条码编号 = å·¥åŽ‚ä»£ç ï¼ˆ1) + è½¦é—´ä»£ç ï¼ˆ060113)+ æœºåž‹å· + å¹´ + æœˆ + æ—¥ + æµæ°´å·
                                    TM = "1" + "060113" + HSubjoin2 + sYear + sPeriod + sDay + LSH.ToString("D5");
                                }
                            }
                            HEntryID = j + 1;
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
@@ -67,6 +67,40 @@
                return objJsonResult;
            }
        }
        [Route("Cg_POInStockBill/cx1")]
        [HttpGet]
        public object cx1(long HInterID,long HSubID)
        {
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBillEdit where hmainid=" + HInterID + " and hsubid=" + HSubID, "h_v_IF_POInStockBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false!";
                    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;
            }
        }
        #region æ”¶æ–™é€šçŸ¥å•分页列表
        [Route("Cg_POInStockBill/page")]
WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
@@ -148,186 +148,7 @@
        #endregion
        #region é‡‡è´­å…¥åº“保存
        /// <summary>
        /// ä¿å­˜é”€å”®å‡ºåº“单
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        [Route("Kf_POStockInBill/SaveSellOutBillList")]
        [HttpPost]
        public object SaveSellOutBillList([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 user = sArray[2].ToString();
            string OperationType = sArray[3].ToString();
            ListModels oListModels = new ListModels();
            try
            {
                //判断权限
                //if (!DBUtility.ClsPub.Security_Log("Kf_SellOutBill_Edit", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无保存权限";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                DAL.ClsKf_POStockInBill1 oBill = new DAL.ClsKf_POStockInBill1();
                List<Model.ClsKf_SellOutBillMain> lsmain = new List<Model.ClsKf_SellOutBillMain>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getSellOutBillMainByJson(msg2);
                foreach (Model.ClsKf_SellOutBillMain oItem in lsmain)
                {
                    oItem.HMaker = user;
                    oItem.HUpDater = user;
                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!没有单据日期,无法保存!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oBill.omodel = oItem;
                }
                //表体数据
                //按 },{来拆分数组 //去掉【和】
                msg3 = msg3.Substring(1, msg3.Length - 2);
                msg3 = msg3.Replace("\\", "");
                msg3 = msg3.Replace("\n", "");  //\n
                List<Model.ClsKf_SellOutBillSub> ls = new List<Model.ClsKf_SellOutBillSub>();
                ls = oListModels.getSellOutBillSubByJson(msg3);
                int i = 0;
                foreach (Model.ClsKf_SellOutBillSub oItemSub in ls)
                {
                    i++;
                    oItemSub.HEntryID = i;
                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItemSub.HCloseType = false;
                    oItemSub.HCloseMan = "";
                    oBill.DetailColl.Add(oItemSub);
                }
                //进行 ä¼šè®¡æœŸé—´ ç»“è´¦ çš„判断和控制
                string s = "";
                int sYear = 0;
                int sPeriod = 0;
                DateTime HDate = DateTime.Now;
                if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
                {
                    objJsonResult.Message = s;
                    return objJsonResult;
                }
                //保存
                //保存完毕后处理
                bool bResult;
                if (Convert.ToInt32(OperationType) == 1)                                //新增保存
                {
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else if (Convert.ToInt32(OperationType) == 4)                          //下推保存
                {
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else                                                                    //编辑保存
                {
                    if (BillOld.ShowBill(lsmain[0].HInterID, ref s) == false)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "此单据有误!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    //判断是否可编辑
                    if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "此单据已经被审核,不允许修改!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    if (BillOld.omodel.HBillStatus > 1)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "此单据处于不可编辑状态,不允许修改!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = s + ",不允许修改";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                //自动审核设置
                if (Convert.ToInt32(OperationType) == 1 || Convert.ToInt32(OperationType) == 4)
                {
                    objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //返回主ID
                    //系统参数  è‡ªåŠ¨å®¡æ ¸
                    string sReturn = "";
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    {
                        if (oSystemParameter.omodel.Kf_SellOutBill_AutoCheck == "Y") //系统参数  è‡ªåŠ¨å®¡æ ¸
                        {
                            objJsonResult.Verify = "Y";
                        }
                        else
                        {
                            objJsonResult.Verify = "N";
                        }
                    }
                }
                else
                {
                    objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //返回主ID
                    objJsonResult.Verify = "N";
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功!";
                    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 é‡‡è´­å…¥åº“单 ä¿å­˜/编辑功能
@@ -495,7 +316,7 @@
                    }
                    String sql = $@"update Kf_ICStockBillMain  set " +
                                "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" + ",HBillNo='" + HBillNo + "'" +
                                "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" + ",HBillNo='" + HBillNo + "'" + ",HDate='" + HDate + "'" +
                                 ",HSupID=" + HSupID + ",HCurID=" + HCurID + ",HSecManagerID=" + HSecManagerID + ", HSTOCKORGID=" + HSTOCKORGID + ",HKeeperID=" + HKeeperID + ",HWHID = " + HWHID
                                 + ",HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HDeptID=" + HDeptID + ",HOWNERID=" + HOWNERID
                                 + ",HAddress='" + HAddress + "',HInnerBillNo='" + HInnerBillNo + "',HProjectID=" + HProjectID + ",HInvoiceBillNo='" + HInvoiceBillNo + "' where HInterID=" + HInterID;
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -2656,14 +2656,17 @@
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (oBill.omodel.HChecker != "")
                    if (oSystemParameter.omodel.WMS_CampanyName != "华舟")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "[0000-1-013]单据已经审核,不能删除!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                        if (oBill.omodel.HChecker != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "[0000-1-013]单据已经审核,不能删除!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    ds = oCn.RunProcReturn($"exec h_p_DelOutInBill {HInterID},'MES_StationOutBill_DeleteRelationCtl'", "h_p_DelOutInBill");
WebAPI/Controllers/CJGL/Sc_ProcExchWorkBackBillController.cs
@@ -229,7 +229,6 @@
                bool bResult;
                if (msg5==1)
                {
                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
@@ -376,7 +375,7 @@
        //#region å·¥åºè¿”工申请单 å®¡æ ¸
        [Route("Sc_ProcExchWorkBackBill/set_CheckBill")]
        [HttpGet]
        public object set_CheckBill(int HInterID, string CurUserName)
        public object set_CheckBill(int HInterID,string IsAudit, string CurUserName)
        {
            try
            {
@@ -413,7 +412,7 @@
                    //审核
                    if (Cj_StationInBillCheckBill(HInterID, int.Parse(Ds.Tables[0].Rows[0]["HProcExchInterID"].ToString()), CurUserName, Ds.Tables[0].Rows[0]["HBillOperationType"].ToString(), ref DBUtility.ClsPub.sExeReturnInfo))
                    if (Cj_StationInBillCheckBill(HInterID, int.Parse(Ds.Tables[0].Rows[0]["HProcExchInterID"].ToString()), CurUserName, IsAudit, ref DBUtility.ClsPub.sExeReturnInfo))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
@@ -539,12 +538,12 @@
        #region å·¥åºè¿”工申请单 å®¡æ ¸/反审核功能
        [Route("Sc_ProcExchWorkBackBill/CheckSc_ProcExchWorkBackBill")]
        [HttpGet]
        public object CheckSc_ProcExchWorkBackBill(string HInterID, int Type, string user)
        public object CheckSc_ProcExchWorkBackBill(string HInterID, string IsAudit, string CurUserName)
        {
            try
            {
                //判断是否有删除权限
                if (!DBUtility.ClsPub.Security_Log("Sc_ProcExchWorkBackBill_Check", 1, false, user))
                if (!DBUtility.ClsPub.Security_Log("Sc_ProcExchWorkBackBill_Check", 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -562,12 +561,12 @@
                    return objJsonResult;
                }
                ClsPub.CurUserName = user;
                ClsPub.CurUserName = CurUserName;
                BillOld.MvarItemKey = "Sc_ProcExchWorkBackBillMain";
                oCN.BeginTran();//开始事务
                //Type 1 å®¡æ ¸  2  åå®¡æ ¸
                if (Type == 1)
                if (IsAudit == "1")
                {
                    //判断单据是否已经审核
                    DataSet ds;
@@ -588,7 +587,7 @@
                    //审核前控制
                    string HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
                    sql = "exec h_p_Sc_ProcExchWorkBackBill_BeforeCheckCtrl " + int.Parse(HInterID) + ",'" + HBillNo + "','" + user + "'";
                    sql = "exec h_p_Sc_ProcExchWorkBackBill_BeforeCheckCtrl " + int.Parse(HInterID) + ",'" + HBillNo + "','" + CurUserName + "'";
                    ds = oCN.RunProcReturn(sql, "h_p_Sc_ProcExchWorkBackBill_BeforeCheckCtrl");
                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                    {
@@ -609,7 +608,7 @@
                    }
                    //审核单据
                    if (!BillOld.CheckBill(Int64.Parse(HInterID), HBillNo, "h_p_Sc_ProcExchWorkBackBill_AfterCheckCtrl", user, ref ClsPub.sExeReturnInfo))
                    if (!BillOld.CheckBill(Int64.Parse(HInterID), HBillNo, "h_p_Sc_ProcExchWorkBackBill_AfterCheckCtrl", CurUserName, ref ClsPub.sExeReturnInfo))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
@@ -638,7 +637,7 @@
                    //反审核前控制
                    string HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
                    sql = "exec h_p_Sc_ProcExchWorkBackBill_BeforeUnCheckCtrl " + int.Parse(HInterID) + ",'" + HBillNo + "','" + user + "'";
                    sql = "exec h_p_Sc_ProcExchWorkBackBill_BeforeUnCheckCtrl " + int.Parse(HInterID) + ",'" + HBillNo + "','" + CurUserName + "'";
                    ds = oCN.RunProcReturn(sql, "h_p_Sc_ProcExchWorkBackBill_BeforeUnCheckCtrl");
                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                    {
@@ -659,7 +658,7 @@
                    }
                    //反审核单据
                    if (BillOld.AbandonCheck(Int64.Parse(HInterID), HBillNo, "h_p_Sc_ProcExchWorkBackBill_AfterUnCheckCtrl", user, ref ClsPub.sExeReturnInfo))
                    if (BillOld.AbandonCheck(Int64.Parse(HInterID), HBillNo, "h_p_Sc_ProcExchWorkBackBill_AfterUnCheckCtrl", CurUserName, ref ClsPub.sExeReturnInfo))
                    {
                        //SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                        //DataSet DSet = oCn.RunProcReturn("exec h_p_Sc_ICMOBill_AbandonCheckCtrl " + int.Parse(HInterID), "h_p_Sc_ICMOBill_AbandonCheckCtrl");
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -1448,7 +1448,7 @@
                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败!原因:审核前判断失败,请与网络管理人员联系";
                        objJsonResult.data = null;
                        oCN.RollBack();
@@ -1458,7 +1458,7 @@
                    if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
                        objJsonResult.data = null;
                        oCN.RollBack();
@@ -1471,7 +1471,7 @@
                    if (!oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_MoveStockBill_AfterCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败!原因:" + ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
@@ -1502,7 +1502,7 @@
                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.count = 0;
                        objJsonResult.Message = "反审核失败!原因:反审核前判断失败,请与网络管理人员联系";
                        objJsonResult.data = null;
                        return objJsonResult;
@@ -1511,7 +1511,7 @@
                    if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.count = 0;
                        objJsonResult.Message = "反审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
                        objJsonResult.data = null;
                        return objJsonResult;
@@ -1526,7 +1526,7 @@
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败!原因:" + ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
WebAPI/Controllers/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Sc_BarCodeController.cs
@@ -1672,7 +1672,7 @@
                                   ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
                                   ",HGiveAwayFlag,JMHSupID,JMHSupNumber,JMHSupName,HTH" +
                                   ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
                                   ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName,HCheckEmpName " +
                                   ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName,HCheckEmpName,HBarCodeStatus " +
                                   ") values ("
                                   + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
                                   + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID2.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
@@ -1682,7 +1682,7 @@
                                   + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
                                   + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)+",'"+ JMHSupID.ToString()+"','"+ JMHSupNumber+"','"+ JMHSupName+"','"+ HTH
                                   + "','" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "'"
                                   + ",'" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "','" + HCheckEmpName2 + "'" + ")");
                                   + ",'" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "','" + HCheckEmpName2 + "','合格'" + ")");
                        }
                        else
                        {
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
@@ -9,7 +9,7 @@
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.EndpointUtil.dll">
      <publishTime>04/07/2020 16:33:48</publishTime>
@@ -72,13 +72,13 @@
      <publishTime>04/22/2021 11:48:12</publishTime>
    </File>
    <File Include="bin/GetuiServerApiSDK.dll">
      <publishTime>01/27/2026 10:11:35</publishTime>
      <publishTime>01/19/2026 18:29:10</publishTime>
    </File>
    <File Include="bin/GetuiServerApiSDK.dll.config">
      <publishTime>01/27/2026 10:11:35</publishTime>
      <publishTime>01/19/2026 18:29:10</publishTime>
    </File>
    <File Include="bin/Google.ProtocolBuffers.dll">
      <publishTime>01/27/2026 10:11:35</publishTime>
      <publishTime>01/19/2026 18:29:10</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -105,7 +105,7 @@
      <publishTime>05/09/2021 01:08:30</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
@@ -156,7 +156,7 @@
      <publishTime>04/06/2026 20:27:21</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>03/08/2023 15:09:56</publishTime>
@@ -297,7 +297,7 @@
      <publishTime>01/28/2015 12:03:16</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 12:02:18</publishTime>
@@ -372,61 +372,61 @@
      <publishTime>11/29/2018 21:26:30</publishTime>
    </File>
    <File Include="Config/kdapi.config">
      <publishTime>04/06/2023 15:57:01</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>04/06/2023 15:57:01</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>04/06/2023 15:57:01</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>04/06/2023 15:57:01</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="DLL/Interop.grsvr6Lib.dll">
      <publishTime>01/04/2026 18:33:49</publishTime>
      <publishTime>12/16/2025 16:29:36</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
@@ -435,7 +435,7 @@
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
@@ -444,130 +444,130 @@
      <publishTime>03/19/2022 07:38:42</publishTime>
    </File>
    <File Include="libman.json">
      <publishTime>07/12/2023 08:14:21</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>03/24/2026 21:43:36</publishTime>
      <publishTime>03/25/2026 10:40:27</publishTime>
    </File>
    <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
      <publishTime>12/08/2025 16:05:47</publishTime>
      <publishTime>12/10/2025 17:08:59</publishTime>
    </File>
    <File Include="Scripts/jquery.signalR-2.2.2.js">
      <publishTime>03/02/2026 10:25:32</publishTime>
      <publishTime>01/28/2026 14:08:07</publishTime>
    </File>
    <File Include="Scripts/jquery.signalR-2.2.2.min.js">
      <publishTime>03/02/2026 10:25:32</publishTime>
      <publishTime>01/28/2026 14:08:07</publishTime>
    </File>
    <File Include="Template/barCodeTemplateStorage.json">
      <publishTime>09/01/2025 08:23:20</publishTime>
      <publishTime>09/05/2025 16:16:48</publishTime>
    </File>
    <File Include="Utility/Barcode.ashx">
      <publishTime>01/04/2026 18:33:49</publishTime>
      <publishTime>12/16/2025 16:29:36</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:36</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:36</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:36</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:36</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:36</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:36</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>04/06/2026 20:28:12</publishTime>