Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

llj

2025-10-13 ce58bfdb73054fa181e0731d60f4c2e74798cabb

 WebAPI/Controllers/LMESController.cs

@@ -3045,7 +3045,7 @@
        //墨西哥白标生成
        [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
@@ -3055,7 +3055,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)
@@ -3305,7 +3305,7 @@

        [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,string HOrgID)
        public object SaveToSc_PackUnionBillMain(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;
@@ -3316,7 +3316,7 @@
                {
                    if (LDM != "其他" && BBM != "其他")
                    {
                        ds = oCN.RunProcReturn($"exec h_p_MES_HBarCode_White_SMR_MXG {zxQty},'{BBM}','{HMaterNumber}','{HBillNo}'", "h_p_MES_HBarCode_White_SMR_MXG");
                        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();
                    }
                }                             
@@ -3646,7 +3646,6 @@

        #endregion


        #region 产线包装单列表查询

        [Route("LEMS/MES_ProductionLinePackagingList_Json")]
@@ -3808,6 +3807,48 @@

        #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删除缓存表中扫码记录-产线包装单