修改岗位备料首选料和备选料的关系

UAS-MES/FunctionCode/Make/Make_PositionStock.cs

@@ -88,7 +88,7 @@ namespace UAS_MES.Make
                                 sql.Clear();
                                 sql.Append("select sp_id,sp_oneuseqty,sp_fsoncode,sp_soncode,sp_prefix from stepbom left join stepproduct on sp_sbid=sb_id ");
                                 sql.Append("where sb_craftcode='" + ma_craftcode.Text + "' and  sb_prodcode='" + ma_prodcode.Text + "' and ");
-                                sql.Append("sb_bomversion='" + ma_bomversion.Text + "'  and sp_stepcode='" + User.CurrentStepCode + "' and sp_soncode ='" + bar_prodcode + "' and sp_tracekind=2 ");
+                                sql.Append("sb_bomversion='" + ma_bomversion.Text + "'  and sp_stepcode='" + User.CurrentStepCode + "' and (sp_soncode ='" + bar_prodcode + "' or sp_fsoncode='" + bar_prodcode + "')and sp_tracekind=2 ");
                                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                                 if (dt.Rows.Count > 0)
                                 {
@@ -138,13 +138,14 @@ namespace UAS_MES.Make
         private void InsertMakeSourceStock(DataTable dt, int Barremain)
         {
             string sp_oneuseqty = dt.Rows[0]["sp_oneuseqty"].ToString();
-            string sp_soncode = dt.Rows[0]["sp_fsoncode"].ToString();
+            string sp_fsoncode = dt.Rows[0]["sp_fsoncode"].ToString();
+            string sp_soncode = dt.Rows[0]["sp_soncode"].ToString();
             string sp_prefix = dt.Rows[0]["sp_prefix"].ToString();
             sql.Clear();
             sql.Append("insert into makesourcestock (mss_id,mss_makecode,mss_linecode ,mss_craftcode,");
             sql.Append("mss_stepcode,mss_barcode,mss_fprodcode,mss_indate,mss_inman,mss_qty,");
             sql.Append("mss_remain,mss_baseqty,mss_prodcode,mss_maid,mss_sourcecode) values(makesourcestock_seq.nextval,'" + ma_code.Text + "','" + User.UserLineCode + "',");
-            sql.Append("'" + ma_craftcode.Text + "','" + sc_stepcode.Text + "','" + pr_batchnum.Text + "','" + sp_soncode + "',");
+            sql.Append("'" + ma_craftcode.Text + "','" + sc_stepcode.Text + "','" + pr_batchnum.Text + "','" + sp_fsoncode + "',");
             sql.Append("sysdate,'" + User.UserCode + "','" + Barremain + "','" + Barremain + "','" + sp_oneuseqty + "','" + sp_soncode + "','" + ma_id + "','" + User.UserSourceCode + "')");
             dh.ExecuteSql(sql.GetString(), "insert");
             dh.UpdateByCondition("barcode", "bar_place='" + ma_code.Text + "'", "bar_code='" + pr_batchnum.Text + "'");
@@ -163,11 +164,10 @@ namespace UAS_MES.Make
                 sql.Append("select nvl(mss_makecode,' ') mss_makecode,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 left join make on ma_bomversion=sb_bomversion where sb_prodcode='" + ma_prodcode.Text + "' and sb_craftcode='" + ma_craftcode.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
             {
@@ -175,7 +175,7 @@ namespace UAS_MES.Make
                 sql.Append("select nvl(mss_makecode,' ') mss_makecode,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 ");
-                sql.Append("and mss_stepcode=sp_stepcode and sp_soncode=mss_prodcode where  ");
+                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 order by sp_soncode");
                 DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 BaseUtil.FillDgvWithDataTable(BatchProductDGV, dt);