Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -254,7 +254,7 @@ namespace UAS_MES.Make
                                         LoadData();
                                         if (int.Parse(pa_currentqty.Text == "" ? "0" : pa_currentqty.Text) == pr_outboxinnerqty.Value)
                                         {
-                                            dh.UpdateByCondition("package", "pa_status=1", "pa_outboxcode='" + pa_outboxcode.Text + "'");
+                                            dh.UpdateByCondition("package", "pa_status=1,pa_packageqty=pa_currentqty", "pa_outboxcode='" + pa_outboxcode.Text + "'");
                                             pa_status.Text = "1";
                                             pa_standardqty.Text = "";
                                             if (AutoPrint.Checked)

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -328,7 +328,7 @@ namespace UAS_MES.Make
                                             //检查重量合格
                                             if (float.Parse(weight.Text) > MinWeight && float.Parse(weight.Text) < MaxWeight)
                                             {
-                                                dh.UpdateByCondition("package", "pa_status=1,pa_weight='" + weight.Text + "'", "pa_outboxcode='" + pa_outboxcode.Text + "'");
+                                                dh.UpdateByCondition("package", "pa_status=1,pa_packageqty=pa_currentqty,pa_weight='" + weight.Text + "'", "pa_outboxcode='" + pa_outboxcode.Text + "'");
                                                 pa_standardqty.Text = "";
                                                 pa_status.Text = "1";
                                                 OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "称量合格\n", Color.Green);

UAS-MES/FunctionCode/Make/Make_SpecialCartonPack.cs

@@ -277,7 +277,7 @@ namespace UAS_MES.Make
                                         //满箱更新状态为1
                                         if (int.Parse(pa_currentqty.Text == "" ? "0" : pa_currentqty.Text) + 1 == int.Parse(pr_outboxinnerqty.Text))
                                         {
-                                            dh.UpdateByCondition("package", "pa_status=1,pa_weight='" + weight.Text + "'", "pa_outboxcode='" + pa_outboxcode.Text + "'");
+                                            dh.UpdateByCondition("package", "pa_status=1,pa_packageqty=pa_currentqty,pa_weight='" + weight.Text + "'", "pa_outboxcode='" + pa_outboxcode.Text + "'");
                                             if (AutoPrint.Checked)
                                                 Print_Click(new object(), new EventArgs());
                                         }
@@ -479,7 +479,7 @@ namespace UAS_MES.Make
         private void PackageDetail_DataSourceChanged(object sender, EventArgs e)
         {
             if (PackageDetail.RowCount == 1)
-            {
+            { 
                 LoadCheckQTY();
                 pr_code.Text = dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_sncode='" + PackageDetail.Rows[0].Cells["pd_barcode"].Value.ToString() + "' order by ms_id desc").ToString();
                 dt = (DataTable)dh.ExecuteSql("select pl_labelcode||':'||pl_labelname pl_laname,pl_labelname,pl_labelcode,pl_labelurl,pl_indate from productlabel where pl_prodcode='" + pr_code.Text + "' order by pl_isdefault desc ", "select");