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

yangle

2025-04-07 e1d42208d39262728267034c020dc8bdf2268ef1

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

@@ -990,9 +990,9 @@
        }
        #endregion

        [Route("JIT_DayPlanPlatFormBill/JIT_CompleteSetAnalysis")]
        [HttpGet]
        public object JIT_CompleteSetAnalysis(string sWhere, string user)
        #region é½å¥—分析    åŽŸè°ƒç”¨æ–¹æ³•

        public object JIT_CompleteSetAnalysis_Old(string sWhere, string user)
        {
            try
            {
@@ -1439,6 +1439,103 @@
                return objJsonResult;
            }
        }

        #endregion

        #region é½å¥—分析调用方法    20250402

        [Route("JIT_DayPlanPlatFormBill/JIT_CompleteSetAnalysis")]
        [HttpGet]
        public object JIT_CompleteSetAnalysis(string sWhere, string user)
        {
            try
            {
                string sErrMsg = "";
                if (oSystemParameter.ShowBill(ref sErrMsg) == true)
                {
                    if (oSystemParameter.omodel.WMS_CampanyName == "帅威"
                        || oSystemParameter.omodel.WMS_CampanyName == "凯贝奈特"
                        || oSystemParameter.omodel.WMS_CampanyName == "添康科技"
                        || oSystemParameter.omodel.WMS_CampanyName == "宝工")     //系统参数  å®¢æˆ·å®šåˆ¶åŒ–名称     ç©ºç™½ä¸ºé€šç”¨
                    {
                        objJsonResult = (json)JIT_CompleteSetAnalysis_Old(sWhere, user);
                    }
                    else
                    {
                        objJsonResult = (json)JIT_CompleteSetAnalysis_New(sWhere, user);
                    }
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "获取系统参数失败！ " + sErrMsg;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                LogService.Write("齐套分析操作失败：" + e.Message.ToString());
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.Message.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// é½å¥—分析    æ–°è°ƒç”¨æ–¹æ³•
        /// </summary>
        /// <returns></returns>
        public object JIT_CompleteSetAnalysis_New(string sWhere, string user)
        {
            try
            {
                omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
                string HWorkShopID = omdelMian.HWorkShopID.ToString();
                var HStockOrgID = omdelMian.HProdORGID;

                ds = oCN.RunProcReturn("exec h_p_JIT_CompleteSetAnalysis " + HWorkShopID.ToString() + ",'" + user + "'," + HStockOrgID.ToString(), "h_p_JIT_CompleteSetAnalysis");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "齐套分析发生错误！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);    //运算成功
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "齐套分析失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion

        #endregion

        #region ç”Ÿäº§æ—¥è®¡åˆ’平台 ææ–™è¿ç®—
@@ -1812,14 +1909,17 @@
                    if (oSystemParameter.omodel.WMS_CampanyName == "帅威")
                    {
                        sqlName = "AIS20230129011339";
                        WMS_CampanyName = "帅威";
                    }
                    else if (oSystemParameter.omodel.WMS_CampanyName == "凯贝奈特")
                    {
                        sqlName = "AIS20210820164804";
                        WMS_CampanyName = "凯贝奈特";
                    }
                    else if (oSystemParameter.omodel.WMS_CampanyName == "添康科技")
                    {
                        sqlName = "AIS20240809105013";
                        WMS_CampanyName = "添康科技";
                    }
                    else if (oSystemParameter.omodel.WMS_CampanyName == "宝工")
                    {
@@ -1830,22 +1930,37 @@
                    {
                        sqlName = "AIS20210811135644";
                    }
                }

                if (WMS_CampanyName == "宝工")
                {
                    objJsonResult = (json)JIT_MOMaterLack(fProWorkShopId, fPrdOrgId, user, sqlName);
                }
                else if (HTLType == "缺料")
                {
                    objJsonResult = (json)JIT_QL(fProWorkShopId, fPrdOrgId, user, sqlName);
                }
                else if (HTLType == "生产用料清单")
                {
                 objJsonResult=(json)JIT_PPBOM(fProWorkShopId, fPrdOrgId, user, sqlName);
                }
                    if (WMS_CampanyName == "宝工")
                    {
                        objJsonResult = (json)JIT_MOMaterLack(fProWorkShopId, fPrdOrgId, user);
                    }
                    else if (HTLType == "缺料")
                    {
                        if (WMS_CampanyName == "帅威" || WMS_CampanyName == "凯贝奈特" || WMS_CampanyName == "添康科技")
                        {
                            objJsonResult = (json)JIT_QL(fProWorkShopId, fPrdOrgId, user, sqlName);
                        }
                        else
                        {
                            objJsonResult = (json)JIT_MOMaterReady(fProWorkShopId, fPrdOrgId, user);
                        }
                    }
                    else if (HTLType == "生产用料清单")
                    {
                        objJsonResult = (json)JIT_PPBOM(fProWorkShopId, fPrdOrgId, user, sqlName);
                    }

                return objJsonResult;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "获取系统参数失败！ " + sErr;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
@@ -2772,7 +2887,7 @@
        /// é€šè¿‡æ¬ æ–™è¡¨   ç®—提料 å®å·¥
        /// </summary>
        /// <returns></returns>
        public object JIT_MOMaterLack(string HWorkShopID, int? HProdORGID, string user, string sqlName)
        public object JIT_MOMaterLack(string HWorkShopID, int? HProdORGID, string user)
        {
            try
            {
@@ -2812,6 +2927,50 @@
            }
        }

        /// <summary>
        /// é€šè¿‡é½å¥—表   ç®—提料
        /// </summary>
        /// <returns></returns>
        public object JIT_MOMaterReady(string HWorkShopID, int? HProdORGID, string user)
        {
            try
            {
                ds = oCN.RunProcReturn("exec h_p_JIT_PODemandPlanBill_MOMaterReady " + HWorkShopID.ToString() + ",'" + user + "'," + HProdORGID.ToString(), "h_p_JIT_PODemandPlanBill_MOMaterReady");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "提料运算发生错误！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);    //运算成功
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "提料运算失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion

        #region ç”Ÿäº§æ—¥è®¡åˆ’平台 é”å®š