1

chenhaozhe

2026-01-29 7820e62b6f70671f003d55fa01c2c0613f4cc127

 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"))
@@ -3336,14 +3336,30 @@
                        HDeptID = ds.Tables[0].Rows[0]["HDeptID"].ToString();
                    }
                    oItem.HDeptID = int.Parse(HDeptID);
                    ds = oCN.RunProcReturn("select * from Gy_Group with(nolock)  where HName='" + oItem.HGroupName + "'", "Gy_Group");
                    //班组为提交人的班组
                    //ds = oCN.RunProcReturn("select * from Gy_Group with(nolock)  where HName='" + oItem.HGroupName + "'", "Gy_Group");
                    //string HGroupID = "0";
                    //if (ds.Tables[0].Rows.Count > 0)
                    //{
                    //    HGroupID = ds.Tables[0].Rows[0]["HItemID"].ToString();
                    //}
                    //oItem.HGroupID = int.Parse(HGroupID);
                    string input = getProcessInstanceResponse.Body.Result.Title;
                    int index = input.IndexOf("提交");
                    string HGroupEmpName = "";
                    if (index > 0)
                    {
                        HGroupEmpName = input.Substring(0, index).Trim();//截取提交人名称即班组长名称
                    }
                    ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock)  where HName='" + HGroupEmpName + "'", "Gy_Employee");
                    string HGroupID = "0";
                    if (ds.Tables[0].Rows.Count > 0)
                    {
                        HGroupID = ds.Tables[0].Rows[0]["HItemID"].ToString();
                        HGroupID = ds.Tables[0].Rows[0]["HGroupID"].ToString();
                    }
                    oItem.HGroupID = int.Parse(HGroupID);
                    


                    //反序列化明细内容
                    string tableFieldValue = getProcessInstanceResponse.Body.Result.FormComponentValues[11].Value;
                    List<Row> rows = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Row>>(tableFieldValue);
@@ -3609,20 +3625,43 @@
            string msg = "";
            try
            {
                if (getData_ErrWorkTimesRequest(startTime, endTime, ref msg) == false)
                string sErrMsg = "";
                if (oSystemParameter.ShowBill(ref sErrMsg) == true)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "Exception！" + msg;
                    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;
                }

                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)
            {