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

yxj

2024-09-20 f34c6a21dc58bc0d40a011d6d7366c5eb3f15f15

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

@@ -17,6 +17,8 @@
        public DataSet ds = new DataSet();
        public WebServer webserver = new WebServer();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

        #region ç”Ÿäº§æ—¥è®¡åˆ’ æŸ¥è¯¢
        [Route("JIT_ICMOSortBill/JIT_ICMOSortBillList")]
        [HttpGet]
@@ -34,7 +36,18 @@
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOSortBillList", "h_v_Sc_ICMOSortBillList");

                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret)) {
                    //判断客户为凯贝
                    if (oSystemParameter.omodel.WMS_CampanyName == "凯贝奈特") //系统参数                      
                    {
                        ds = oCN.RunProcReturn("select top 1000 * from h_v_Sc_ICMOSortBillList where 1=1"+ sWhere, "h_v_Sc_ICMOSortBillList");
                    }
                    else {
                        ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOSortBillList where 1=1"+ sWhere , "h_v_Sc_ICMOSortBillList");
                    }
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -60,7 +73,44 @@
        {
            try
            {
                oCN.RunProc("exec h_p_Sc_SetICMOStatus_ReadyMater " + HSourceID.ToString() + "," + HICMOInterID.ToString() + ",'" + HDate.ToShortDateString() + "'," + HStatus.ToString() + ",'" + user + "'");
                oCN.RunProc("exec h_p_Sc_SetICMOStatus_ReadyMater " + HSourceID.ToString() + "," + HICMOInterID.ToString() + ",'" + HDate.ToString("yyyy-MM-dd HH:mm:ss.fff") + "'," + HStatus.ToString() + ",'" + user + "'");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region ç”Ÿäº§æ—¥è®¡åˆ’ è½¦é—´æ‰§è¡Œç¡®è®¤  æ’¤é”€è½¦é—´æ‰§è¡Œç¡®è®¤
        [Route("JIT_ICMOSortBill/JIT_ICMOSortBillWorkShopTure")]
        [HttpGet]
        public object JIT_ICMOSortBillWorkShopTure(string HSourceID, string HICMOInterID, DateTime HDate, int HStatus, string user)
        {
            try
            {
                ds = oCN.RunProcReturn($"select * from Sc_ICMOBillStatus_Tmp_Extend where HSourceID = {HSourceID} and HSourceInterID = {HICMOInterID} and HDate = '{HDate.ToString("yyyy-MM-dd HH:mm:ss.fff")}' ", "Sc_ICMOBillStatus_Tmp_Extend");

                if (ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "仓库未确认,不能进行车间确认！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.RunProc("exec h_p_Sc_SetICMOStatus_ReadyStart " + HSourceID.ToString() + "," + HICMOInterID.ToString() + ",'" + HDate.ToString("yyyy-MM-dd HH:mm:ss.fff") + "'," + HStatus.ToString() + ",'" + user + "'");

                objJsonResult.code = "1";
                objJsonResult.count = 1;