岗位备料只能查看当前线别备料情况

UAS-MES/FunctionCode/Make/Make_PositionStock.cs

@@ -95,10 +95,11 @@ namespace UAS_MES.Make
                                 if (dt.Rows.Count > 0)
                                 {
                                     sql.Clear();
-                                    sql.Append("select mss_makecode,mss_linecode from makesourcestock where mss_barcode = '"+pr_batchnum.Text+"'");
+                                    sql.Append("select mss_makecode,mss_linecode from makesourcestock where mss_barcode = '" + pr_batchnum.Text + "'");
                                     DataTable BARCODE = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                                    if (BARCODE.Rows.Count > 0) {
-                                        OperateResult.AppendText(">>物料批号" + pr_batchnum.Text + "已经被工单:"+BARCODE.Rows[0]["mss_makecode"] +",线别:"+ BARCODE.Rows[0]["mss_linecode"] + "备料\n", Color.Red, pr_batchnum);
+                                    if (BARCODE.Rows.Count > 0)
+                                    {
+                                        OperateResult.AppendText(">>物料批号" + pr_batchnum.Text + "已经被工单:" + BARCODE.Rows[0]["mss_makecode"] + ",线别:" + BARCODE.Rows[0]["mss_linecode"] + "备料\n", Color.Red, pr_batchnum);
                                         return;
                                     }
                                     InsertMakeSourceStock(dt, int.Parse(bar_remain));
@@ -169,27 +170,14 @@ namespace UAS_MES.Make
         {
             if (!show_all_check.Checked)
             {
-                //string ma_linecode = dh.getFieldDataByCondition("make", "ma_linecode", "ma_code = '" + ma_code.Text + "'").ToString();
-                //if (User.UserLineCode == ma_linecode)
-                //{
-                    sql.Clear();
-                    sql.Append("select nvl(mss_makecode,' ') mss_makecode,mss_linecode,sp_fsoncode,nvl(mss_id,0) mss_id,sp_soncode,mss_prodcode,sp_oneuseqty,mss_barcode,nvl(mss_qty,0) mss_qty ,nvl(mss_remain,0)mss_remain,");
-                    sql.Append("pr_detail,nvl(mss_useqty,0) mss_useqty from stepbom left join stepproduct on sp_sbid=sb_id left join product on ");
-                    sql.Append("pr_code=sp_mothercode left join makesourcestock on  mss_craftcode=sb_craftcode and mss_makecode='" + ma_code.Text + "' ");
-                    sql.Append("and mss_stepcode=sp_stepcode and sp_soncode=mss_prodcode and sp_fsoncode=mss_fprodcode left join make on ma_bomversion=sb_bomversion where sb_prodcode='" + ma_prodcode.Text + "' and sb_craftcode='" + ma_craftcode.Text + "' ");
-                    sql.Append("and sp_stepcode='" + User.CurrentStepCode + "' and sp_tracekind=2 and ma_code='" + ma_code.Text + "' order by sp_soncode");
-                    DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                    BaseUtil.FillDgvWithDataTable(BatchProductDGV, dt);
-                //}
-                //else if (!(last_macoe == ma_code.Text))
-                //{
-                //    OperateResult.AppendText(">>所选工单" + ma_code.Text + "所在线别为" + ma_linecode + ",与当前线别" + User.UserLineCode + "不一致\n", Color.Red);
-                //    last_macoe = ma_code.Text;
-                //    BaseUtil.CleanDGVData(BatchProductDGV);
-                //}
-                //else {
-                //    BaseUtil.CleanDGVData(BatchProductDGV);
-                //}
+                sql.Clear();
+                sql.Append("select nvl(mss_makecode,' ') mss_makecode,mss_linecode,sp_fsoncode,nvl(mss_id,0) mss_id,sp_soncode,mss_prodcode,sp_oneuseqty,mss_barcode,nvl(mss_qty,0) mss_qty ,nvl(mss_remain,0)mss_remain,");
+                sql.Append("pr_detail,nvl(mss_useqty,0) mss_useqty from stepbom left join stepproduct on sp_sbid=sb_id left join product on ");
+                sql.Append("pr_code=sp_mothercode left join makesourcestock on  mss_craftcode=sb_craftcode and mss_makecode='" + ma_code.Text + "'  and mss_linecode = '" + User.UserLineCode + "' ");
+                sql.Append("and mss_stepcode=sp_stepcode and sp_soncode=mss_prodcode and sp_fsoncode=mss_fprodcode left join make on ma_bomversion=sb_bomversion where sb_prodcode='" + ma_prodcode.Text + "' and sb_craftcode='" + ma_craftcode.Text + "' ");
+                sql.Append("and sp_stepcode='" + User.CurrentStepCode + "' and sp_tracekind=2 and ma_code='" + ma_code.Text + "' order by sp_soncode");
+                DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                BaseUtil.FillDgvWithDataTable(BatchProductDGV, dt);
             }
             else
             {
@@ -198,7 +186,7 @@ namespace UAS_MES.Make
                 sql.Append("pr_detail,nvl(mss_useqty,0) mss_useqty from stepbom left join stepproduct on sp_sbid=sb_id left join product on ");
                 sql.Append("pr_code=sp_mothercode left join makesourcestock on  mss_craftcode=sb_craftcode ");
                 sql.Append("and mss_stepcode=sp_stepcode and sp_soncode=mss_prodcode and sp_fsoncode=mss_fprodcode where  ");
-                sql.Append(" sp_stepcode='" + User.CurrentStepCode + "' and sp_tracekind=2 and mss_linecode = '"+User.UserLineCode+"' order  by sp_soncode");
+                sql.Append(" sp_stepcode='" + User.CurrentStepCode + "' and sp_tracekind=2 and mss_linecode = '" + User.UserLineCode + "' order  by sp_soncode");
                 DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 BaseUtil.FillDgvWithDataTable(BatchProductDGV, dt);
             }
@@ -241,10 +229,10 @@ namespace UAS_MES.Make
                     string soncode = BatchProductDGV.Rows[e.RowIndex].Cells["sp_soncode"].Value.ToString();
                     if (id != "0")
                     {
-                            dh.ExecuteSql("delete from makesourcestock where mss_id='" + id + "'", "delete");
-                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "岗位备料", "删除物料" + soncode, "", "");
-                            OperateResult.AppendText(">>料号" + soncode + "删除成功\n");
-                            FillDataGridView();
+                        dh.ExecuteSql("delete from makesourcestock where mss_id='" + id + "'", "delete");
+                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "岗位备料", "删除物料" + soncode, "", "");
+                        OperateResult.AppendText(">>料号" + soncode + "删除成功\n");
+                        FillDataGridView();
                     }
                 }
             }
@@ -355,7 +343,8 @@ namespace UAS_MES.Make
                 pr_batchnum.Enabled = false;
                 FillDataGridView();
             }
-            else {
+            else
+            {
                 pr_batchnum.Enabled = true;
                 FillDataGridView();
             }
@@ -387,7 +376,7 @@ namespace UAS_MES.Make
                     List<string> soncodecol = new List<string>();
                     for (int i = 0; i < BatchProductDGV.Rows.Count; i++)
                     {
-                       
+
                         string id = BatchProductDGV.Rows[i].Cells["mss_id"].Value.ToString();
                         string useqty = BatchProductDGV.Rows[i].Cells["mss_useqty"].Value.ToString();
                         string soncode = BatchProductDGV.Rows[i].Cells["sp_soncode"].Value.ToString();
@@ -396,8 +385,8 @@ namespace UAS_MES.Make
                         {
                             idcol.Add(id);
                             makecodecol.Add(makecode);
-                            soncodecol.Add("删除物料"+soncode);
-                            OperateResult.AppendText(">>料号" + soncode + "删除成功\n");   
+                            soncodecol.Add("删除物料" + soncode);
+                            OperateResult.AppendText(">>料号" + soncode + "删除成功\n");
                         }
                     }
                     sql.Clear();
@@ -409,8 +398,9 @@ namespace UAS_MES.Make
                     FillDataGridView();
                 }
             }
-            else {
-                OperateResult.AppendText(">>没有上料记录，无需全部下料\n",Color.Red);
+            else
+            {
+                OperateResult.AppendText(">>没有上料记录，无需全部下料\n", Color.Red);
             }
         }
     }