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

llj

2025-10-13 ce58bfdb73054fa181e0731d60f4c2e74798cabb

 WebAPI/Controllers/Êý¾Ýͬ²½/¶¤¶¤Í¬²½/DD_DataSynchronizationController.cs

@@ -1045,9 +1045,9 @@
                                oItem.HDate = convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd");
                            }

                            if (keys.Contains("selectField_ls9ma7h9"))
                            if (keys.Contains("textField_mc8uekgv"))
                            {
                                oItem.HArea = response.Body.Result[i].FormData["selectField_ls9ma7h9"].ToString().Replace("'", "");
                                oItem.HArea = response.Body.Result[i].FormData["textField_mc8uekgv"].ToString().Replace("'", "");
                            }

                            if (keys.Contains("selectField_ls9ma7h7"))
@@ -3609,20 +3609,43 @@
            string msg = "";
            try
            {
                //if (getData_ErrWorkTimesRequest(startTime,endTime,ref msg) == false)
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "Exception！" + msg;
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = null;
                return objJsonResult;
                string sErrMsg = "";
                if (oSystemParameter.ShowBill(ref sErrMsg) == true)
                {
                    if ( oSystemParameter.omodel.WMS_CampanyName == "添康科技")     //系统参数  å®¢æˆ·å®šåˆ¶åŒ–名称     ç©ºç™½ä¸ºé€šç”¨
                    {
                        //添康专用
                        if (getData_ErrWorkTimesRequest(startTime, endTime, ref msg) == false)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "Exception！" + msg;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "客户错误";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "获取系统参数失败！ " + sErrMsg;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {