优化

zrg

2025-11-26 999e1007eb2b1d4a1f5b19a0addc686b2e30ef2d

 WebAPI/Controllers/LMESController.cs

@@ -323,7 +323,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.Message = "[0000-1-045]没有返回任何记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -331,7 +331,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.Message = "[0000-1-037]获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
@@ -340,7 +340,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -371,7 +371,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！";
                objJsonResult.Message = "[0000-1-045]没有返回任何记录！";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -379,7 +379,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.Message = "[0000-1-050]获取信息成功！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
@@ -633,15 +633,10 @@
            }
        }

        /// <summary>
        /// 扫流转卡号方法（产线包装单、产线组装追溯单）--根据流转卡号保存到temp表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        #region 扫流转卡号方法（产线包装单、产线组装追溯单）--根据流转卡号保存到temp表
        [Route("LEMS/SaveCirculationCard_Json")]
        [HttpGet]
        public object SaveCirculationCard_Json(string HBillNo, string HInterID, string HBillNo2, string HBarCode,
            string HNumber, string HName, string HModel)
        public object SaveCirculationCard_Json(string HBillNo, string HInterID, string HBillNo2, string HBarCode, string HNumber, string HName, string HModel)
        {
            DataSet ds;
            try
@@ -666,8 +661,11 @@
                ds = null;
            }
            return CustomCorrect(ds);
            //return ds.Tables[0].Rows;
        }

        #endregion

        #region 墨西哥白标生成查询

        //墨西哥白标查询
        [Route("MES/MES_BarcodeWhiteLabelReport")]
@@ -686,14 +684,12 @@
                ds = null;
            }
            return CustomCorrect(ds);
            //return ds.Tables[0].Rows;
        }

        //墨西哥白标生成
        [Route("LEMS/SaveCirculationCard_Json_MXG")]
        [HttpGet]
        public object SaveCirculationCard_Json_MXG(string HBillNo, string HInterID, string HBillNo2, string HBarCode,
    string HNumber, string HName, string HModel)
        public object SaveCirculationCard_Json_MXG(string HBillNo, string HInterID, string HBillNo2, string HBarCode, string HNumber, string HName, string HModel, string NBXMH, string HOrgID)
        {
            DataSet ds;
            try
@@ -703,7 +699,7 @@
                {
                    HBarCode = " ";
                }
                ds = oCN.RunProcReturn("exec Save_Sc_ProcessExchangeBillMainToTmp_MXG '" + HBillNo + "','" + HInterID + "','" + HBillNo2 + "','" + HBarCode + "','" + HNumber + "','" + HName + "','" + HModel + "'", "Save_Sc_ProcessExchangeBillMainToTmp_MXG");
                ds = oCN.RunProcReturn("exec Save_Sc_ProcessExchangeBillMainToTmp_MXG '" + HBillNo + "','" + HInterID + "','" + HBillNo2 + "','" + HBarCode + "','" + HNumber + "','" + HName + "','" + HModel + "','" + NBXMH + "','" + HOrgID + "'", "Save_Sc_ProcessExchangeBillMainToTmp_MXG");

            }
            catch (Exception e)
@@ -711,18 +707,15 @@
                ds = null;
            }
            return CustomCorrect(ds);
            //return ds.Tables[0].Rows;
        }

        /// <summary>
        /// 扫子件条码方法（产线包装单、产线组装追溯单）--根据子件条码保存到temp表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        #endregion

        #region 扫子件条码方法（产线包装单、产线组装追溯单）--根据子件条码保存到temp表

        [Route("LEMS/SaveSubBarcode_Json")]
        [HttpGet]
        public object SaveSubBarcode_Json(string HBillNo, string SubBarcode, string HInterID, string HBillNo2,
            string HBillType, string sMaker, string HBarCode, string HNumber, string HName, string HModel)
        public object SaveSubBarcode_Json(string HBillNo, string SubBarcode, string HInterID, string HBillNo2, string HBillType, string sMaker, string HBarCode, string HNumber, string HName, string HModel, string HOrgID)
        {
            DataSet ds1;
            DataSet ds;
@@ -738,13 +731,14 @@
                    ds1 = oCN.RunProcReturn("select * from KF_PonderationBillMain_Temp where HSourceBillNo = '" + SubBarcode + "' and HBillType = '" + HBillType + "'", "KF_PonderationBillMain_Temp");
                    if (ds1.Tables[0].Rows.Count > 0)
                    {
                        return CustomError("该子件条码已存在");
                        return CustomError("[0000-2-039]该子件条码已存在");
                    }
                    if (HBarCode == null || HBarCode.Equals(""))
                    {
                        HBarCode = " ";
                    }
                    ds = oCN.RunProcReturn("exec h_p_Save_SubBarcodeToTmp '" + HBillNo + "','" + SubBarcode + "','" + HInterID + "','" + HBillNo2 + "','" + HBillType + "','" + sMaker + "','" + HBarCode + "','" + HNumber + "','" + HName + "','" + HModel + "'", "h_p_Save_SubBarcodeToTmp");
                    ds = oCN.RunProcReturn("exec h_p_Save_SubBarcodeToTmp '" + HBillNo + "','" + SubBarcode + "','" + HInterID + "','" + HBillNo2 + "','" + HBillType + "','" + sMaker + "','" + HBarCode + "','" + HNumber + "','" + HName + "','" + HModel + "','" + HOrgID + "'", "h_p_Save_SubBarcodeToTmp");
                    LogService.Write("ID:" + HInterID + ",流转卡号:" + HBillNo + ",单据号:" + HBillNo2 + ",条码:" + SubBarcode + ",托条码:" + HBarCode);
                }

            }
@@ -753,8 +747,38 @@
                ds = null;
            }
            return CustomCorrect(ds);
            //return ds.Tables[0].Rows;
        }

        [Route("LEMS/SaveSubBarcode_Json_MXG")]
        [HttpGet]
        public object SaveSubBarcode_Json_MXG(string HBillNo, string SubBarcode, string HInterID, string HBillNo2, string HBillType, string sMaker, string HBarCode, string HNumber, string HName, string HModel, string HOrgID)
        {
            DataSet ds1;
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds1 = oCN.RunProcReturn("select * from KF_PonderationBillMain_Temp where HSourceBillNo = '" + SubBarcode + "' and HBillType = '" + HBillType + "'", "KF_PonderationBillMain_Temp");
                if (ds1.Tables[0].Rows.Count > 0)
                {
                    return CustomError("该子件条码已存在");
                }
                if (HBarCode == null || HBarCode.Equals(""))
                {
                    HBarCode = " ";
                }
                ds = oCN.RunProcReturn("exec h_p_Save_SubBarcodeToTmp '" + HBillNo + "','" + SubBarcode + "','" + HInterID + "','" + HBillNo2 + "','" + HBillType + "','" + sMaker + "','" + HBarCode + "','" + HNumber + "','" + HName + "','" + HModel + "','" + HOrgID + "'", "h_p_Save_SubBarcodeToTmp");
                LogService.Write("ID:" + HInterID + ",流转卡号:" + HBillNo + ",单据号:" + HBillNo2 + ",条码:" + SubBarcode + ",托条码:" + HBarCode);
            }
            catch (Exception e)
            {
                ds = null;
            }
            return CustomCorrect(ds);
        }


        #endregion


        [Route("LEMS/SaveSubBarcode_Json_MXG")]
@@ -787,11 +811,8 @@
            //return ds.Tables[0].Rows;
        }

        /// <summary>
        /// 查询条码档案表里的镭雕条码的合计数量方法（产线包装单）
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        #region 查询条码档案表里的镭雕条码的合计数量方法（产线包装单）

        [Route("LEMS/Select_Gy_BarCodeBill_HQty")]
        [HttpGet]
        public object Select_Gy_BarCodeBill_HQty(string HBarCode)
@@ -815,17 +836,15 @@
                ds = null;
            }
            return CustomCorrect(ds);
            //return ds.Tables[0].Rows;
        }

        /// <summary>
        /// 更新条码档案表里的镭雕条码的合计数量方法（产线包装单）
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        #endregion

        #region 更新条码档案表里的镭雕条码的合计数量方法（产线包装单）

        [Route("LEMS/Update_Gy_BarCodeBill_HQty")]
        [HttpGet]
        public object Update_Gy_BarCodeBill_HQty(string HBarCode,string HQty)
        public object Update_Gy_BarCodeBill_HQty(string HBarCode, string HQty)
        {
            DataSet ds;
            try
@@ -833,11 +852,11 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (HBarCode == null || HBarCode.Equals(""))
                {
                    return CustomError("唯一条码不能为空！");//h_p_Update_Gy_BarCodeBill_HQty
                    return CustomError("唯一条码不能为空！");
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_Update_Gy_BarCodeBill_HQty " + HBarCode + "," + HQty + "", "Gy_BarCodeBill");
                    ds = oCN.RunProcReturn("exec h_p_Update_Gy_BarCodeBill_HQty " + HBarCode + "," + HQty + "", "h_p_Update_Gy_BarCodeBill_HQty");
                }

            }
@@ -845,15 +864,13 @@
            {
                ds = null;
            }
            return CustomCorrect(ds);
            //return ds.Tables[0].Rows;
            return CustomCorrect(ds); ;
        }

        /// <summary>
        /// 更新扫码记录列表方法（产线包装单、产线组装追溯单）
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        #endregion

        #region 更新扫码记录列表方法（产线包装单、产线组装追溯单）

        [Route("LEMS/Update_HBillNo_SubBarcodeList_Json")]
        [HttpGet]
        public object Update_HBillNo_SubBarcodeList_Json(string HBillNo)
@@ -877,17 +894,15 @@
                ds = null;
            }
            return CustomCorrect(ds);
            //return ds.Tables[0].Rows;
        }

        /// <summary>
        /// 提交-主表方法（产线包装单）--根据流传卡号从temp表保存到主表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        #endregion

        #region 提交-主表方法（产线包装单）--根据流传卡号从temp表保存到主表

        [Route("LEMS/SaveToSc_PackUnionBillMain")]
        [HttpGet]
        public object SaveToSc_PackUnionBillMain(string HBillNo, string HRemark,string HProjectNum,string zxQty, string BBM, string LDM, string HMaterNumber)
        public object SaveToSc_PackUnionBillMain(string HBillNo, string HRemark, string HProjectNum, string zxQty, string BBM, string LDM, string HMaterNumber, string HOrgID)
        {
            DataSet ds;
            DataSet dsHSNum;
@@ -895,7 +910,7 @@
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string HBarCode_White = "";
                if (LDM != "其他" && BBM != "其他" )
                if (LDM != "其他" && BBM != "其他")
                {
                    ds = oCN.RunProcReturn($"exec h_p_MES_HBarCode_White_SMR {zxQty},'{BBM}','{HMaterNumber}','{HBillNo}'", "h_p_MES_HBarCode_White_SMR");
                    HBarCode_White = ds.Tables[0].Rows[0]["HBarCode_White"].ToString();
@@ -906,45 +921,45 @@
                oCN.RunProc("exec h_p_WMS_SetMaxNo '" + HProjectNum + "'");
                int HSNum = ClsPub.isInt(dsHSNum.Tables[0].Rows[0][0]) + 1;
                //调用进制转换方法把流水号转换成流水号2
                string HSNum2 = GetNewCodeByNum(HSNum,1,2);
                string HSNum2 = GetNewCodeByNum(HSNum, 1, 2);
                if (HBillNo == null || HBillNo.Equals(""))
                {
                    return CustomError("流转卡号不能为空！");
                    return CustomError("[0000-1-057]流转卡号不能为空！");
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain '" + HBillNo + "','" + HRemark + "'," + HSNum + ",'" + HSNum2 + "','" + HBarCode_White + "'", "h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain");
                    ds = oCN.RunProcReturn("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain '" + HBillNo + "','" + HRemark + "'," + HSNum + ",'" + HSNum2 + "','" + HBarCode_White + "','" + HOrgID + "'", "h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain");
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "异常！"+e.ToString();
                objJsonResult.Message = "[0000-1-051]异常！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
            return CustomCorrect(ds);
            //return ds.Tables[0].Rows;
        }


        [Route("LEMS/SaveToSc_PackUnionBillMain_MXG")]
        [HttpGet]
        public object SaveToSc_PackUnionBillMain(string HBillNo, string HRemark, string HProjectNum, string zxQty, string BBM, string LDM, string HMaterNumber, string HBarCode_White)
        public object SaveToSc_PackUnionBillMain_MXG(string HBillNo, string HRemark, string HProjectNum, string zxQty, string BBM, string LDM, string HMaterNumber, string HBarCode_White, string HOrgID, string NBXMH)
        {
            DataSet ds;
            DataSet dsHSNum;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                //HBarCode_White = "";
                //if (LDM != "其他" && BBM != "其他")
                //{
                //    ds = oCN.RunProcReturn($"exec h_p_MES_HBarCode_White_SMR {zxQty},'{BBM}','{HMaterNumber}','{HBillNo}'", "h_p_MES_HBarCode_White_SMR");
                //    HBarCode_White = ds.Tables[0].Rows[0]["HBarCode_White"].ToString();
                //}

                if (HBarCode_White != "")
                {
                    if (LDM != "其他" && BBM != "其他")
                    {
                        ds = oCN.RunProcReturn($"exec h_p_MES_HBarCode_White_SMR_MXG {zxQty},'{BBM}','{HMaterNumber}','{HBillNo}','{NBXMH}','{HOrgID}'", "h_p_MES_HBarCode_White_SMR_MXG");
                        HBarCode_White = ds.Tables[0].Rows[0]["HBarCode_White"].ToString();
                    }
                }               
                //项目号获取流水号
                dsHSNum = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HProjectNum + "'", "h_p_WMS_GetMaxNo");
                oCN.RunProc("exec h_p_WMS_SetMaxNo '" + HProjectNum + "'");
@@ -957,7 +972,7 @@
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain_MXG '" + HBillNo + "','" + HRemark + "'," + HSNum + ",'" + HSNum2 + "','" + HBarCode_White + "'", "h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain_MXG");
                    ds = oCN.RunProcReturn("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain_MXG '" + HBillNo + "','" + HRemark + "'," + HSNum + ",'" + HSNum2 + "','" + HBarCode_White + "','" + HOrgID + "'", "h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain_MXG");
                }
            }
            catch (Exception e)
@@ -969,15 +984,13 @@
                return objJsonResult;
            }
            return CustomCorrect(ds);
            //return ds.Tables[0].Rows;
        }

        #endregion

        /// <summary>
        /// 提交-子表方法（产线包装单）--根据子件条码从temp表保存到子表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>

        #region 提交-子表方法（产线包装单）--根据子件条码从temp表保存到子表

        [Route("LEMS/SaveToSc_PackUnionBillSub")]
        [HttpGet]
        public object SaveToSc_PackUnionBillSub(string HitemID, string HRemark)
@@ -1001,14 +1014,72 @@
                ds = null;
            }
            return CustomCorrect(ds);
            //return ds.Tables[0].Rows;
        }

        /// <summary>
        /// 更新temp表的标记字段方法（产线包装单）
        ///参数：string sql。
        ///返回值：object。
        /// </summary>

        [Route("LEMS/SaveToSc_PackUnionBillSub_Batch")]
        [HttpGet]
        public object SaveToSc_PackUnionBillSub_Batch(string HitemID, string HRemark)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (HitemID == null || HitemID.Equals(""))
                {
                    return CustomError("更新失败HitemID为空！");
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillSub_Batch '" + HitemID + "','" + HRemark + "'", "h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillSub_Batch");
                }

            }
            catch (Exception e)
            {
                ds = null;
            }
            return CustomCorrect(ds);
        }
        //更新没有反写的数据
        [Route("LEMS/SaveToSc_PackUnionBillSub_Back")]
        [HttpGet]
        public object SaveToSc_PackUnionBillSub_Back(string HInterID, string HRemark)
        {
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (HInterID == null || HInterID.Equals(""))
                {
                    return CustomError("[0000-2-058]更新失败HitemID为空！");
                }
                else
                {
                    oCN.RunProc("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillSub_Back '" + HInterID + "','" + HRemark + "'");
                }

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "[0000-2-059]更新成功！";
                objJsonResult.data = null;
                return objJsonResult;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "[0000-2-058]" + e.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }

        }

        #endregion

        #region 更新temp表的标记字段方法（产线包装单）

        [Route("LEMS/Update_Flag_HRelationInterID")]
        [HttpGet]
        public object Update_Flag_HRelationInterID(string HitemID)
@@ -1032,14 +1103,37 @@
                ds = null;
            }
            return CustomCorrect(ds);
            //return ds.Tables[0].Rows;
        }

        /// <summary>
        /// 提交-主表方法（产线组装追溯单）--根据流传卡号从temp表保存到主表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("LEMS/Update_Flag_HRelationInterID_Batch")]
        [HttpGet]
        public object Update_Flag_HRelationInterID_Batch(string HitemID)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (HitemID == null || HitemID.Equals(""))
                {
                    return CustomError("更新失败HitemID为空！");
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_Update_Flag_HRelationInterID_Batch '" + HitemID + "'", "h_p_Update_Flag_HRelationInterID_Batch");
                }

            }
            catch (Exception e)
            {
                ds = null;
            }
            return CustomCorrect(ds);
        }

        #endregion

        #region  提交-主表方法（产线组装追溯单）--根据流传卡号从temp表保存到主表

        [Route("LEMS/SaveToSc_AssemblyBillMain")]
        [HttpGet]
        public object SaveToSc_AssemblyBillMain(string HBillNo)
@@ -1063,14 +1157,11 @@
                ds = null;
            }
            return CustomCorrect(ds);
            //return ds.Tables[0].Rows;
        }

        /// <summary>
        /// 提交-子表方法（产线组装追溯单）--根据子件条码从temp表保存到子表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        #endregion
        #region 提交-子表方法（产线组装追溯单）--根据子件条码从temp表保存到子表

        [Route("LEMS/SaveToSc_AssemblyBillSub")]
        [HttpGet]
        public object SaveToSc_AssemblyBillSub(string HitemID)
@@ -1094,17 +1185,15 @@
                ds = null;
            }
            return CustomCorrect(ds);
            //return ds.Tables[0].Rows;
        }

        /// <summary>
        /// 生成唯一条码方法（产线包装单）--保存时生成唯一条码
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        #endregion

        #region 生成唯一条码方法（产线包装单）--保存时生成唯一条码

        [Route("LEMS/SaveBarCode_json")]
        [HttpGet]
        public object SaveBarCode_json(string sHMaterID, string sHUnitID, string sHBarcodeNo, string sHMaterName)
        public object SaveBarCode_json(string sHMaterID, string sHUnitID, string sHBarcodeNo, string sHMaterName, string HOrgID)
        {
            DataSet ds;
            string sTMNumber = "";
@@ -1159,7 +1248,7 @@
                string HEndDate = sDate;
                string HWorkLineName = "";
                string HBarCodeDate = sDate;
                string HSTOCKORGID = "0";
                string HSTOCKORGID = HOrgID;
                string HOWNERID = "0";
                string HSeOrderBillNo = "";
                string HMaterName = sHMaterName;
@@ -1174,7 +1263,7 @@
                    + " HSourceBillType,HEndQty,HBarcodeQtys,HBarcodeNo,HDeptID,"
                    + " HWhID,HSPID,HRemark,HCusID,HCusType,"
                    + " HEndDate,HWorkLineName,HBarCodeDate,HSTOCKORGID,HOWNERID,"
                    + "HSeOrderBillNo,HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo "
                    + "HSeOrderBillNo,HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo"
                    + ") values ('" + HBarCode + "','" + HBarCodeType + "','" + sHMaterID + "','" + sHUnitID + "','" + HQty + "','"
                        + HBatchNo + "','" + HSupID + "','" + HGroupID + "','" + HMaker + "',getdate(),'"
                        + HPrintQty + "','" + HinitQty + "','" + HSourceInterID + "','" + HSourceEntryID + "','" + HSourceBillNo + "','"
@@ -1192,11 +1281,10 @@
            return CustomCorrect(ds);
        }

        /// <summary>
        /// 返回产线包装单列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        #endregion

        #region 产线包装单列表查询

        [Route("LEMS/MES_ProductionLinePackagingList_Json")]
        [HttpGet]
        public object MES_ProductionLinePackagingList_Json(string sWhere)
@@ -1207,11 +1295,11 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 1000 * from h_v_ProductionLinePackagingList order by 扫码日期 desc, 唯一条码 desc", "h_v_ProductionLinePackagingList");
                    ds = oCN.RunProcReturn("select top 300 * from h_v_ProductionLinePackagingList order by 扫码日期 desc, 唯一条码 desc", "h_v_ProductionLinePackagingList");
                }
                else
                {
                    string sql1 = "select  * from h_v_ProductionLinePackagingList where 1 = 1 ";
                    string sql1 = "select top 300 * from h_v_ProductionLinePackagingList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql2 = " order by 扫码日期 desc, 唯一条码 desc";
                    sql = sql + sql2;
@@ -1226,11 +1314,10 @@
            return GetObjectJson(ds);
        }

        /// <summary>
        /// 删除对应的包装单
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        #endregion

        #region 删除对应的包装单

        [Route("LEMS/DelMES_ProductionLinePackagingList")]
        [HttpGet]
        public object DelMES_ProductionLinePackagingList(string HInterID)
@@ -1243,7 +1330,7 @@
                oCN.RunProc("Delete from KF_PonderationBillMain_Temp where HInterID = " + HInterID);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功！";
                objJsonResult.Message = "[0000-1-008]删除成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -1251,16 +1338,16 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败！";
                objJsonResult.Message = "[0000-1-007]删除失败！";
                objJsonResult.data = e.ToString();
                return objJsonResult;
            }
        }
        /// <summary>
        /// 扫批次条码方法（产线组装追溯单）--根据批次条码到条码档案表中获取数据保存到temp表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>

        #endregion

        #region 扫批次条码方法（产线组装追溯单）--根据批次条码到条码档案表中获取数据保存到temp表

        [Route("LEMS/Save_Gy_BarCodeBillToTmp_Json")]
        [HttpGet]
        public object Save_Gy_BarCodeBillToTmp_Json(string HInterID, string HBillNo2, string HBarCode)
@@ -1291,14 +1378,12 @@
                ds = null;
            }
            return CustomCorrect(ds);
            //return ds.Tables[0].Rows;
        }

        /// <summary>
        /// 返回产线组装追溯单列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        #endregion

        #region 产线组装追溯单列表查询

        [Route("LEMS/MES_AssemblyTraceabilityList_Json")]
        [HttpGet]
        public object MES_AssemblyTraceabilityList_Json(string sWhere)
@@ -1328,11 +1413,10 @@
            return GetObjectJson(ds);
        }

        /// <summary>
        /// 返回产线组装追溯单列表--过滤条件为镭雕条码的专用方法
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        #endregion

        #region 返回产线组装追溯单列表--过滤条件为镭雕条码的专用方法

        [Route("LEMS/MES_AssemblyTraceabilityList_E_Json")]
        [HttpGet]
        public object MES_AssemblyTraceabilityList_E_Json(string HICMOBillNo)
@@ -1358,10 +1442,55 @@
            return GetObjectJson(ds);
        }

        //根据ID删除缓存表中扫码记录-产线包装单
        #endregion

        #region 获取白标项目号

        [Route("LEMS/GetHProject_MXG")]
        [HttpGet]
        public object GetHProject_MXG(string HOrgID)
        {
            DataSet ds;
            DataSet dsHSNum;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

                ds = oCN.RunProcReturn("select HInterID,HSupBarCodeNumber HName from Sc_PackUnionBillBarCode_temp where HUSEORGID='" + HOrgID + "'", "Sc_PackUnionBillBarCode_temp");

                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取成功!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "异常！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 根据ID删除缓存表中扫码记录-产线包装单

        [Route("LEMS/DelProductionLinePackagingTable")]
        [HttpGet]
        public object DelProductionLinePackagingTable(long sHInterID,string HSourceBillNo)
        public object DelProductionLinePackagingTable(long sHInterID, string HSourceBillNo)
        {
            try
            {
@@ -1369,7 +1498,7 @@
                oCn.RunProc("Delete TOP(1) from KF_PonderationBillMain_Temp where HInterID = " + sHInterID + " and HSourceBillNo = '" + HSourceBillNo + "'", ref DBUtility.ClsPub.sExeReturnInfo);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功！";
                objJsonResult.Message = "[0000-1-008]删除成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -1377,11 +1506,14 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败！";
                objJsonResult.Message = "[0000-1-007]删除失败！";
                objJsonResult.data = e.ToString();
                return objJsonResult;
            }
        }

        #endregion


        //判断条码是否是不良的状态
        [Route("LEMS/HbadStaus")]
@@ -1408,7 +1540,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "当前条码的状态为:"+ ds.Tables[0].Rows[0]["HReasult"].ToString() + "！";
                    objJsonResult.Message = "[0000-2-037]当前条码的状态为:" + ds.Tables[0].Rows[0]["HReasult"].ToString() + "！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -1425,7 +1557,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "异常！";
                objJsonResult.Message = "[0000-1-010]异常！";
                objJsonResult.data = e.ToString();
                return objJsonResult;
            }
@@ -1455,7 +1587,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查无数据!";
                    objJsonResult.Message = "[0000-1-045]查无数据!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -1463,7 +1595,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "！";
                    objJsonResult.Message = "[0000-1-051]"+ ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -1475,7 +1607,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "查无数据!";
                        objJsonResult.Message = "[0000-1-045]查无数据!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -1483,7 +1615,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString();
                        objJsonResult.Message = "[0000-1-051]" + ds.Tables[0].Rows[0]["HBackRemark"].ToString();
                        return objJsonResult;
                    }
                    else {
@@ -1499,14 +1631,15 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "异常！";
                objJsonResult.Message = "[0000-1-010]异常！";
                objJsonResult.data = e.ToString();
                return objJsonResult;
            }
        }


        //09项目判断配件条码 模具穴号是否匹配
        #region  09项目判断配件条码 模具穴号是否匹配

        [Route("LEMS/h_p_CJ_SNBarCodeBillMouldBathSelect")]
        [HttpGet]
        public object h_p_CJ_SNBarCodeBillMouldBathSelect(string SubBarcode, string HProcExchBillNo, string HBillType)
@@ -1522,7 +1655,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查无数据!";
                    objJsonResult.Message = "[0000-1-045]查无数据!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -1530,7 +1663,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString();
                    objJsonResult.Message = "[0000-1-051]" + ds.Tables[0].Rows[0]["HBackRemark"].ToString();
                    return objJsonResult;
                }
                else
@@ -1546,13 +1679,16 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "异常！";
                objJsonResult.Message = "[0000-1-010]异常！";
                objJsonResult.data = e.ToString();
                return objJsonResult;
            }
        }

        //判断总的包装数量是否超过流转卡数量
        #endregion

        #region  判断总的包装数量是否超过流转卡数量

        [Route("LEMS/h_p_Sc_ProductionLinePackaging_Checkqty")]
        [HttpGet]
        public object h_p_Sc_ProductionLinePackaging_Checkqty(long HInterID)
@@ -1574,7 +1710,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = Convert.ToString(ds.Tables[0].Rows[0]["HBackRemark"]);
                    objJsonResult.Message = "[0000-1-051]" + Convert.ToString(ds.Tables[0].Rows[0]["HBackRemark"]);
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -1583,17 +1719,16 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "异常！";
                objJsonResult.Message = "[0000-1-010]异常！";
                objJsonResult.data = e.ToString();
                return objJsonResult;
            }
        }

        /// <summary>
        /// 缓存表包装单记录
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        #endregion     

        #region 缓存表包装单列表

        [Route("LEMS/PackUnionCacheList")]
        [HttpGet]
        public object PackUnionCacheList(string sWhere)
@@ -1604,7 +1739,7 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 5000 * from h_v_PackUnionBillCacheList order by 扫码时间 desc", "h_v_PackUnionBillCacheList");
                    ds = oCN.RunProcReturn("select top 500 * from h_v_PackUnionBillCacheList order by 扫码时间 desc", "h_v_PackUnionBillCacheList");
                }
                else
                {
@@ -1642,6 +1777,8 @@
            }
        }

        #endregion

        #region 打印查询数据
        [Route("Gy_SOPBillList/WindowPrintList")]
        [HttpGet]