2023-02-20 001 焊接修改

SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs

@@ -22,6 +22,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                 this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
                 this.InitTreeMenu();//加载树
                 HJGL_PipelineComponentService.InitMainItemDownList(drpState,true);
+                HJGL_PipelineComponentService.InitMainItemDownProductionStateList(drpProductionState,true);
 
 
             }
@@ -223,7 +224,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
         {
             string strSql = @"	SELECT com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,
                                      com.PipelineId, punit.UnitName AS PreUnit,aunit.UnitName AS AssembleUnit,
-									 com.QRCode,com.State,pipe.PlanStartDate,com.DrawingName,com.ReceiveDate,
+									 com.QRCode,com.State,com.ProductionState,pipe.PlanStartDate,com.DrawingName,com.ReceiveDate,
 									 person.PersonName
                               FROM HJGL_Pipeline_Component com 
 							  LEFT JOIN HJGL_Pipeline pipe  ON pipe.PipelineId =com.PipelineId
@@ -248,7 +249,12 @@ namespace FineUIPro.Web.HJGL.PreDesign
                 listStr.Add(new SqlParameter("@State", drpState.SelectedValue));
 
             }
+            if (drpProductionState.SelectedValue != Const._Null)
+            {
+                strSql += " AND com.ProductionState =@ProductionState";
+                listStr.Add(new SqlParameter("@ProductionState", drpProductionState.SelectedValue.ToString()));
 
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
@@ -518,6 +524,22 @@ namespace FineUIPro.Web.HJGL.PreDesign
             }
             return StateName;
         }
+        public string ConvertProductionState(object state)
+        {
+            string StateName = string.Empty;
+            if (!string.IsNullOrEmpty(state.ToString()))
+            {
+
+                if (state != null)
+                {
+                    string txt = HJGL_PipelineComponentService.GetProductionState().FirstOrDefault(x => x.Value == state.ToString()).Text;
+
+                    return txt;
+                }
+                return "";
+            }
+            return StateName;
+        }
         protected void btnImportQRCode_Click(object sender, EventArgs e)
         {
             PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("PrePipelineQRCodeIn.aspx?", "导入 - ")));