工单信息关联信息查询

UAS-MES/FunctionCode/Query/Query_MakeInf.cs

@@ -46,8 +46,9 @@ namespace UAS_MES.Query
                 string ma_prodcode = dt.Rows[0]["ma_prodcode"].ToString();
                 string ma_craftcode = dt.Rows[0]["ma_craftcode"].ToString();
                 string ma_bomversion = dt.Rows[0]["ma_bomversion"].ToString();
+                string ma_salecode = dt.Rows[0]["ma_salecode"].ToString();
                 sql.Clear();
-                sql.Append("select pr_code,pr_outboxinnerqty,pr_sendchecktype,pr_detail,pr_agingtime");
+                sql.Append("select pr_code,pr_outboxinnerqty,case pr_sendchecktype when 'SaleCode' then '按合同送检' when 'LineCode' then '按线别送检' end pr_sendchecktype,pr_detail,pr_agingtime");
                 sql.Append(",(pr_colorboxminw||'-'||pr_colorboxmaxw||' '||pr_colorboxunit)pr_colorboxweight,");
                 sql.Append("(pr_cartonminw||'-'||pr_cartonmaxw||' '||pr_cartonunit)pr_cartonweight from product where pr_code='" + ma_prodcode + "'");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
@@ -63,6 +64,24 @@ namespace UAS_MES.Query
                     BaseUtil.FillDgvWithDataTable(Carft, dt);
                 }
                 sql.Clear();
+                sql.Append("select (msr_startno||'-'||msr_endno) beforesnrange,msr_qty beforesnqty from makesnrule where msr_makecode='" + MakeCode.Text + "' and msr_type='before'");
+                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                if (dt.Rows.Count > 0)
+                {
+                    BaseUtil.SetFormValue(this.Controls, dt);
+                }
+                sql.Clear();
+                sql.Append("select (msr_startno||'-'||msr_endno) aftersnrange,msr_qty aftersnqty from makesnrule where msr_makecode='" + MakeCode.Text + "' and msr_type='after'");
+                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                if (dt.Rows.Count > 0)
+                {
+                    BaseUtil.SetFormValue(this.Controls, dt);
+                }
+                //获取SN关联信息
+                MacNum.Text = dh.getFieldDataByCondition("Makeaddresslist", "count(1)", "mal_makecode='" + MakeCode.Text + "' and mal_mac is not null").ToString();
+                BTNum.Text = dh.getFieldDataByCondition("Makeaddresslist", "count(1)", "mal_makecode='" + MakeCode.Text + "' and mal_bt is not null").ToString();
+                IMEINum.Text = dh.getFieldDataByCondition("Makeimeilist", "count(1)", "mil_makecode='" + MakeCode.Text + "' and mil_imei1 is not null").ToString();
+                sql.Clear();
                 sql.Append("select * from StepProduct left join product on pr_code=sp_soncode where sp_bomversion='" + ma_bomversion + "' and sp_mothercode='" + ma_prodcode + "' and sp_craftcode='" + ma_craftcode + "'");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 if (dt.Rows.Count > 0)

UAS-MES/FunctionCode/Query/Query_MakeInf.resx

@@ -207,6 +207,9 @@
   <metadata name="CD_IFWEIGH.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="CD_FIRSTSTEP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="CD_IFOFFLINE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -216,9 +219,6 @@
   <metadata name="CD_STEPCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="CD_FIRSTSTEP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="CD_STEPNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -282,6 +282,9 @@
   <metadata name="CD_IFWEIGH.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="CD_FIRSTSTEP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="CD_IFOFFLINE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -291,9 +294,6 @@
   <metadata name="CD_STEPCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="CD_FIRSTSTEP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="CD_STEPNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>