executeSql参数修改

UAS-MES/FunctionCode/Make/Make_LabelCheck.cs

@@ -78,8 +78,8 @@ namespace UAS_MES.Make
                 {
                     //查询是否存在该ms_id
                     sql.Clear();
-                    sql.Append("select max(ms_id) ms_id from makeserial where ms_sncode =:sncode or exists (select 1 from  makesnrelation where beforesn=:beforesn  and ms_makecode=makecode)");
-                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", sncode.Text, sncode.Text);
+                    sql.Append("select max(ms_id) ms_id from makeserial where ms_sncode ='"+sncode.Text+"' or exists (select 1 from  makesnrelation where beforesn='"+sncode.Text+"'  and ms_makecode=makecode)");
+                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "0")
                     {
                         //SN错误,不存在
@@ -93,8 +93,8 @@ namespace UAS_MES.Make
                     {
                         //根据该ms_id查询ms_imei1,ms_makecode信息
                         sql.Clear();
-                        sql.Append("select ms_imei1 from  makeserial  where ms_id=:msid");
-                        info = (DataTable)dh.ExecuteSql(sql.GetString(), "select", dt.Rows[0]["ms_id"].ToString());
+                        sql.Append("select ms_imei1 from  makeserial  where ms_id='"+ dt.Rows[0]["ms_id"].ToString() + "'");
+                        info = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         if (info.Rows.Count > 0)
                         {
                             //不为null 并且不为””才继续
@@ -102,7 +102,7 @@ namespace UAS_MES.Make
                             {
                                 // SN对应的IMEI不存在
                                 //>> 请输入SN
-                                OperateResult.AppendText("<<SN" + sncode.Text + "对应的IMEI不存在\n", Color.Red);
+                                OperateResult.AppendText("<<序列号" + sncode.Text + "对应的IMEI不存在\n", Color.Red);
                                 sncode.Text = "";
                                 OperateResult.AppendText(">>请输入SN\n", Color.Black);
                             }
@@ -114,7 +114,7 @@ namespace UAS_MES.Make
                                 SN = sncode.Text;
                                 //>>SN对应的IMEI号为:xxxxxxxxx
                                 //>> 请输入彩盒上的IMEI
-                                OperateResult.AppendText("<<SN对应的IMEI号为:" + imei1 + "\n", Color.Green);
+                                OperateResult.AppendText("<<序列号"+sncode.Text+"对应的IMEI号为:" + imei1 + "\n", Color.Green);
                                 OperateResult.AppendText(">>请输入彩盒上的IMEI\n", Color.Black);
                                 sncode.Text = "";
                                 //设定要输入imei1
@@ -148,8 +148,8 @@ namespace UAS_MES.Make
                                     sql.Clear();
                                     sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode,pr_detail ||','|| pr_spec pr_detailspec,");
                                     sql.Append("ma_qty - nvl(mcd_okqty, 0) remain_qty from make left join makecraftdetail on ");
-                                    sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code=:omakeCode  and mcd_stepcode=:CurrentStepCode");
-                                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select",omakeCode,User.CurrentStepCode);
+                                    sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='"+ omakeCode + "'  and mcd_stepcode='"+ User.CurrentStepCode + "'");
+                                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                                     BaseUtil.SetFormValue(Controls, dt);
                                     //将SN,时间，结果记录在页面
                                     recordResult(SN, DateTime.Now.ToString(), "成功");
@@ -190,7 +190,7 @@ namespace UAS_MES.Make
                         imei1 = "";
                         //IMEI核对失败
                         //>> 请输入SN
-                        OperateResult.AppendText(">>IMEI核对失败\n", Color.Red);
+                        OperateResult.AppendText(">>IMEI核对失败,不一致\n", Color.Red);
                         sncode.Text = "";
                         OperateResult.AppendText(">>请输入SN\n", Color.Black);
                     }

UAS-MES/UAS-MES.csproj

@@ -416,6 +416,12 @@
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_BigBoxWeight.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_BigBoxWeight.Designer.cs">
+      <DependentUpon>Make_BigBoxWeight.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_CollectBTMAC.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -434,12 +440,24 @@
     <Compile Include="FunctionCode\Make\Make_ColorBoxLabelPrint.Designer.cs">
       <DependentUpon>Make_ColorBoxLabelPrint.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_Decompose.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_Decompose.Designer.cs">
+      <DependentUpon>Make_Decompose.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_FuselageLabelPrint.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="FunctionCode\Make\Make_FuselageLabelPrint.Designer.cs">
       <DependentUpon>Make_FuselageLabelPrint.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_LabelCheck.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_LabelCheck.Designer.cs">
+      <DependentUpon>Make_LabelCheck.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_NewBadCode.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -452,6 +470,12 @@
     <Compile Include="FunctionCode\Make\Make_NewMatainInf.Designer.cs">
       <DependentUpon>Make_NewMatainInf.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_PalletCollection.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_PalletCollection.Designer.cs">
+      <DependentUpon>Make_PalletCollection.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_SeqProgramTransform.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -903,6 +927,9 @@
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_BigBoxWeight.resx">
+      <DependentUpon>Make_BigBoxWeight.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_CollectBTMAC.resx">
       <DependentUpon>Make_CollectBTMAC.cs</DependentUpon>
     </EmbeddedResource>
@@ -912,15 +939,24 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_ColorBoxLabelPrint.resx">
       <DependentUpon>Make_ColorBoxLabelPrint.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_Decompose.resx">
+      <DependentUpon>Make_Decompose.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_FuselageLabelPrint.resx">
       <DependentUpon>Make_FuselageLabelPrint.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_LabelCheck.resx">
+      <DependentUpon>Make_LabelCheck.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_NewBadCode.resx">
       <DependentUpon>Make_NewBadCode.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_NewMatainInf.resx">
       <DependentUpon>Make_NewMatainInf.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_PalletCollection.resx">
+      <DependentUpon>Make_PalletCollection.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_SeqProgramTransform.resx">
       <DependentUpon>Make_SeqProgramTransform.cs</DependentUpon>
     </EmbeddedResource>