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

ch

2022-10-20 e79ef1f195754b2afdc8e1e149d64774c7757ad9

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

@@ -60,7 +60,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;