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

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -143,7 +143,7 @@ namespace UAS_MES.Make
                         //获取序列号信息
                         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("pr_outboxinnerqty from makeserial left join product on ms_prodcode=pr_code left join packagedetail ");
+                        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");
                         if (dt.Rows.Count > 0)

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -219,7 +219,7 @@ namespace UAS_MES.Make
                     {
                         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("pr_outboxinnerqty from makeserial left join product on ms_prodcode=pr_code left join packagedetail ");
+                        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");
                         if (dt.Rows.Count > 0)

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -94,22 +94,26 @@ namespace UAS_MES.Make
                                 //核对工序
                                 if (LogicHandler.CheckStepSNAndMacode(makecode, User.UserSourceCode, code.Text, User.UserCode, out oMakecode, out oMsid, out errorMessage))
                                 {
-                                    //按照out出的工单号查出工单相关信息，并赋值到相关控件
-                                    sql.Clear();
-                                    sql.Append("select ma_code as ms_macode,mcd_okqty,ma_qty,ma_qty-mcd_inqty as remain_qty,pr_detail,pr_code as ma_prodcode ");
-                                    sql.Append("from makeserial left join make on ms_makecode=ma_code left join product on ");
-                                    sql.Append("ms_prodcode=pr_code left join makecraftdetail on ms_makecode=mcd_macode where ms_id=:msid and mcd_stepcode='" + User.CurrentStepCode + "'");
-                                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", oMsid);
-                                    if (dt.Rows.Count > 0)
+                                    //如果用户没有选择工单号
+                                    if (ms_macode.Text == "" || ms_macode.Text != makecode)
                                     {
-                                        //记录数量
-                                        ma_qty = int.Parse(dt.Rows[0]["ma_qty"].ToString());
-                                        BaseUtil.SetFormValue(this.Controls, dt);
-                                    }
-                                    else
-                                    {
-                                        OperateResult.AppendText(">>序列号" + code.Text + "不存在\n", Color.Red,code);
-                                        return;
+                                        //按照out出的工单号查出工单相关信息，并赋值到相关控件
+                                        sql.Clear();
+                                        sql.Append("select ma_code as ms_macode,mcd_okqty,ma_qty,ma_qty-mcd_inqty as remain_qty,pr_detail,pr_code as ma_prodcode ");
+                                        sql.Append("from makeserial left join make on ms_makecode=ma_code left join product on ");
+                                        sql.Append("ms_prodcode=pr_code left join makecraftdetail on ms_makecode=mcd_macode where ms_id=:msid and mcd_stepcode='" + User.CurrentStepCode + "'");
+                                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", oMsid);
+                                        if (dt.Rows.Count > 0)
+                                        {
+                                            //记录数量
+                                            ma_qty = int.Parse(dt.Rows[0]["ma_qty"].ToString());
+                                            BaseUtil.SetFormValue(this.Controls, dt);
+                                        }
+                                        else
+                                        {
+                                            OperateResult.AppendText(">>序列号" + code.Text + "不存在\n", Color.Red, code);
+                                            return;
+                                        }
                                     }
                                     //获取需要关联采集的信息，以及校验规则
                                     ListA = (DataTable)dh.ExecuteSql("select * from productsnrelation where psr_prodcode='" + ma_prodcode.Text + "' order by psr_detno", "select");

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -166,21 +166,16 @@ namespace UAS_MES.Make
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                 {
                     //判断界面工单是否为空时的序列号是否自动归属工单
-                    if (!LogicHandler.GetMakeInfo(ms_sncode.Text, out oMakeCode, out ErrorMessage))
-                    {
-                        if (ma_code.Text == "")
-                        {
-                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
-                            return;
-                        }
-                    }
                     if (LogicHandler.CheckStepSNAndMacode(ma_code.Text == "" ? oMakeCode : ma_code.Text, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
                     {
-                        dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,pr_detail,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");
-                        if (dt.Rows.Count > 0)
+                        if (ma_code.Text != oMakeCode && oMakeCode != null)
                         {
-                            BaseUtil.SetFormValue(this.Controls, dt);
-                            LockMakeCode.Checked = true;
+                            dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,pr_detail,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");
+                            if (dt.Rows.Count > 0)
+                            {
+                                BaseUtil.SetFormValue(this.Controls, dt);
+                                LockMakeCode.Checked = true;
+                            }
                         }
                         dt = (DataTable)dh.ExecuteSql("select ms_nextstepcode,ms_reworkstatus,nvl(ms_ifrework,0)ms_ifrework,ms_stepcode,ms_status,nvl(st_ifrepair,0) st_ifrepair from makeserial left join step on ms_stepcode=st_code where ms_id='" + oMSID + "'", "select");
                         string status = dt.Rows[0]["ms_status"].ToString();

UAS-MES/Properties/Settings.Designer.cs

@@ -109,7 +109,7 @@ namespace UAS_MES.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("\\\\172.16.11.99\\ShareTest")]
+        [global::System.Configuration.DefaultSettingValueAttribute("\\\\172.16.66.51\\lable")]
         public string FTPAddress {
             get {
                 return ((string)(this["FTPAddress"]));

UAS-MES/Properties/Settings.settings

@@ -24,7 +24,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="FTPAddress" Type="System.String" Scope="User">
-      <Value Profile="(Default)">\\172.16.11.99\ShareTest</Value>
+      <Value Profile="(Default)">\\172.16.66.51\lable</Value>
     </Setting>
     <Setting Name="MES" Type="System.String" Scope="Application">
       <Value Profile="(Default)">Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.230.200)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</Value>