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

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -156,7 +156,7 @@ namespace UAS_MES.Make
                         PR_CHECKCARTONW = dh.getFieldDataByCondition("craftdetail left join craft on cr_id=cd_crid left join makeserial on ms_craftcode =cr_code and cr_prodcode = ms_prodcode", "nvl(cd_ifweigh,'0') cd_ifweigh", "ms_sncode='" + sn_code.Text + "' and ms_makecode='" + oMakeCode + "' and cd_stepcode = '" + User.CurrentStepCode + "'").ToString();
                         //获取序列号信息
                         sql.Clear();
-                        sql.Append("select pr_code,ms_makecode,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,pr_code,pr_detail,");
+                        sql.Append("select ms_makecode,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,");
                         sql.Append("nvl(pr_outboxinnerqty,0)pr_outboxinnerqty,nvl(PR_CHECKCARTONW,'0') PR_CHECKCARTONW from makeserial left join product on ms_prodcode=pr_code left join packagedetail ");
                         sql.Append("on pd_barcode=ms_sncode left join package on pa_id =pd_paid where ms_id='" + oMsID + "'");
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
@@ -298,7 +298,7 @@ namespace UAS_MES.Make
                                     }
                                     sn_code.Clear();
                                 }
-                                else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
+                                else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red,sn_code);
                             }
                         }
                         //勾选了取消箱号先验证箱号存不存在，存在的话移除掉，重新加载一次数据

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -241,7 +241,7 @@ namespace UAS_MES.Make
                         }
                         // PR_CHECKCARTONW = dh.getFieldDataByCondition("craftdetail left join craft on cr_id=cd_crid left join makeserial on ms_craftcode =cr_code", "nvl(cd_ifweigh,'0') cd_ifweigh", "ms_sncode='" + sn_code.Text + "' and ms_makecode='" + oMakeCode + "' and cd_stepcode = '" + User.CurrentStepCode + "'").ToString();
                         sql.Clear();
-                        sql.Append("select ms_makecode,pr_code,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,pr_code,pr_detail,");
+                        sql.Append("select ms_makecode,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,");
                         sql.Append("nvl(pr_outboxinnerqty,0)pr_outboxinnerqty from makeserial left join product on ms_prodcode=pr_code left join packagedetail ");
                         sql.Append("on pd_barcode=ms_sncode left join package on pa_id =pd_paid where ms_id='" + oMsID + "'");
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -84,7 +84,7 @@ namespace UAS_MES.Make
             if (e.KeyCode == Keys.Enter)
             {
                 sql.Clear();
-                sql.Append("select pa_makecode,pa_id,pa_status,pa_standardqty,pa_packageqty,pa_totalqty,pa_currentqty,pa_outboxcode,pa_totalqty,pa_custcode ");
+                sql.Append("select pa_makecode,pa_id,pa_status,nvl(pa_standardqty,PR_PALLETQTY)pa_standardqty,pa_packageqty,pa_totalqty,pa_currentqty,pr_code pa_prodcode,pa_outboxcode,pa_totalqty,pa_custcode ");
                 sql.Append("from package left join packagedetail on pa_id =pd_paid left join product on pr_code=pd_prodcode where pa_outboxcode='" + pa_outboxcode.Text + "' and pa_type =3");
                 DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 if (dt.Rows.Count > 0)
@@ -111,7 +111,7 @@ namespace UAS_MES.Make
                         return;
                     }
                     sql.Clear();
-                    sql.Append("select pd_makecode pa_makecode,nvl(pa_downstatus,0)pa_downstatus,pr_packrule,pa_id,pd_prodcode pa_prodcode,pa_mothercode,pa_salecode,pa_status,pa_nextstep from packagedetail ");
+                    sql.Append("select nvl(pa_downstatus,0)pa_downstatus,pr_packrule,pa_id,pa_mothercode,pa_salecode,pa_status,pa_nextstep from packagedetail ");
                     sql.Append("left join package on pd_paid=pa_id left join product on pr_code=pd_prodcode where pd_outboxcode='" + outboxcode.Text + "'");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     if (dt.Rows.Count > 0)