修改代码提交

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -372,6 +372,7 @@ namespace UAS_MES.Make
                                 SQLS.Add("update package set pa_mothercode='' where pa_outboxcode='" + outboxcode.Text + "'");
                                 dh.ExecuteSQLTran(SQLS.ToArray());
                                 OperateResult.AppendText(">>箱号" + outboxcode.Text + "取消采集成功\n", Color.Green);
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "大箱采集", "大箱" + pa_outboxcode.Text + "取消采集卡通箱" + outboxcode.Text + "成功", outboxcode.Text, "");
                                 LoadCollectNum();
                                 palletcode_KeyDown(sender, e);
                                 outboxcode.Clear();
@@ -402,16 +403,11 @@ namespace UAS_MES.Make
 
         private void FillPrintLabel()
         {
-            DataTable _dt = (DataTable)dh.ExecuteSql("select la_id,la_printnos,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pa_prodcode.Text + "' and la_templatetype='大箱标' and la_statuscode='AUDITED' order by la_isdefault", "select");
+            DataTable _dt = (DataTable)dh.ExecuteSql("select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pa_prodcode.Text + "' and la_templatetype='大箱标' and la_statuscode='AUDITED' order by la_isdefault", "select");
             PrintLabel.DataSource = _dt;
-            PrintLabel.DisplayMember = "la_name";
+            PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";
-            for (int i = 0; i < _dt.Rows.Count; i++)
-            {
-                BaseUtil.GetPrintLabel(_dt.Rows[i]["la_name"].ToString(), _dt.Rows[i]["la_url"].ToString());
-            }
         }
-
         private void LoadCollectNum()
         {
             pa_totalqty.Text = dh.getFieldDataByCondition("package", "pa_totalqty", "pa_outboxcode='" + pa_outboxcode.Text + "' and pa_type=2").ToString();
@@ -442,14 +438,6 @@ namespace UAS_MES.Make
             {
                 if (dh.getFieldDataByCondition("package", "pa_status", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString() == "1")
                 {
-                    if (Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "大箱标", "0", out ErrorMessage))
-                    {
-                        OperateResult.AppendText(">>打印箱号" + pa_outboxcode.Text + "\n", Color.Black);
-                    }
-                    else
-                    {
-                        OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
-                    }
                     if (!AutoOutBoxCode.Checked)
                     {
                         pa_outboxcode.Focus();
@@ -460,10 +448,19 @@ namespace UAS_MES.Make
                         outboxcode.Focus();
                         outboxcode.SelectAll();
                     }
+                    //doc = lbl.Documents.Open(PrintLabel.Text);
+                    if (Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "大箱标", "0", out ErrorMessage))
+                    {
+                        OperateResult.AppendText(">>打印大箱" + pa_outboxcode.Text + "\n", Color.Black);
+                    }
+                    else
+                    {
+                        OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
+                    }
                 }
-                else OperateResult.AppendText(">>必须封箱才能进行打印\n", Color.Red);
+                else OperateResult.AppendText(">>必须封大箱才能进行打印\n", Color.Red);
             }
-            else OperateResult.AppendText(">>产品" + pa_prodcode.Text + "未维护打印标签或者标签未审核\n", Color.Red);
+            else OperateResult.AppendText(">>产品" + pa_prodcode.Text + "未维护打印标签\n", Color.Red);
         }
 
         private void ReleasePallet_Click(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.cs

@@ -186,6 +186,16 @@ namespace UAS_MES.Make
                     //{
                     //    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                     //}
+                    DataTable dt1 = (DataTable)dh.ExecuteSql("select wm_concat(ms_sncode) from makeserial where  ms_downstatus=-1 and ms_outboxcode='" + outboxcode.Text + "'", "select");
+                    if (dt1.Rows.Count > 0)
+                    {
+
+                        if (dt1.Rows[0][0].ToString() != "")
+                        {
+                            OperateResult.AppendText(">序列号：" + dt1.Rows[0][0].ToString() + "处于下地状态，箱不允许过站\n", Color.Red);
+                            return;
+                        }
+                    }
                     if (!LogicHandler.OutBoxStepPass(outboxcode.Text, ma_code.Text, User.UserSourceCode, User.UserCode, "卡通箱:" + outboxcode.Text + "整箱过站", "卡通箱整箱过站", out ErrorMessage))
                     {
                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, outboxcode);

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -434,6 +434,15 @@ namespace UAS_MES.Make
                                     }
                                     if (int.Parse(pa_currentqty.Text == "" ? "0" : pa_currentqty.Text) == int.Parse(pr_outboxinnerqty.Text))
                                     {
+                                        DataTable dt1 = (DataTable)dh.ExecuteSql("select wm_concat(ms_sncode) from makeserial where  ms_downstatus=-1 and ms_outboxcode='" + pa_outboxcode.Text + "'", "select");
+                                        if (dt1.Rows.Count > 0)
+                                        {
+                                            if (dt1.Rows[0][0].ToString() != "")
+                                            {
+                                                OperateResult.AppendText(">序列号：" + dt1.Rows[0][0].ToString() + "处于下地状态，箱不允许过站\n", Color.Red, sn_code);
+                                                return;
+                                            }
+                                        }
                                         dh.UpdateByCondition("package", "pa_status=1,pa_packageqty=pa_currentqty,pa_totalqty=pa_currentqty", "pa_outboxcode='" + pa_outboxcode.Text + "'");
                                      
                                         pa_status.Text = "1";
@@ -582,6 +591,15 @@ namespace UAS_MES.Make
                 {
                     LoadData();
                     LoadGridData();
+                    DataTable dt1 = (DataTable)dh.ExecuteSql("select wm_concat(ms_sncode) from makeserial where  ms_downstatus=-1 and ms_outboxcode='" + pa_outboxcode.Text + "'", "select");
+                    if (dt1.Rows.Count > 0)
+                    {
+                        if (dt1.Rows[0][0].ToString() != "")
+                        {
+                            OperateResult.AppendText(">序列号：" + dt1.Rows[0][0].ToString() + "处于下地状态，箱不允许过站\n", Color.Red, sn_code);
+                            return;
+                        }
+                    }
                     if (PR_CHECKCARTONW != "0")
                     {
                         OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "处于称重工序，请在卡通箱称重界面进行操作\n", Color.Black, sn_code);

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -476,6 +476,15 @@ namespace UAS_MES.Make
                                                 return;
                                             }
                                         }
+                                        DataTable dt1 = (DataTable)dh.ExecuteSql("select wm_concat(ms_sncode) from makeserial where  ms_downstatus=-1 and ms_outboxcode='" + pa_outboxcode.Text + "'", "select");
+                                        if (dt1.Rows.Count > 0)
+                                        {
+                                            if (dt1.Rows[0][0].ToString() != "")
+                                            {
+                                                OperateResult.AppendText(">序列号：" + dt1.Rows[0][0].ToString() + "处于下地状态，箱不允许过站\n", Color.Red, sn_code);
+                                                return;
+                                            }
+                                        }
                                         if (CollecRemark.Checked && pa_remark.Text == "")
                                         {
                                             OperateResult.AppendText(">已勾选采集备注，备注信息必须填写，如不需采集，请取消勾选\n", Color.Red, sn_code);
@@ -612,6 +621,15 @@ namespace UAS_MES.Make
                 {
                     LoadData();
                     LoadGridData();
+                    DataTable dt1 = (DataTable)dh.ExecuteSql("select wm_concat(ms_sncode) from makeserial where  ms_downstatus=-1 and ms_outboxcode='" + pa_outboxcode.Text + "'", "select");
+                    if (dt1.Rows.Count > 0)
+                    {
+                        if (dt1.Rows[0][0].ToString() != "")
+                        {
+                            OperateResult.AppendText(">序列号：" + dt1.Rows[0][0].ToString() + "处于下地状态，箱不允许过站\n", Color.Red, sn_code);
+                            return;
+                        }
+                    }
                     ActWeigh = weight.Text == "" ? "0" : weight.Text.Replace("kg", "").Trim();
                     float weigh = float.Parse(ActWeigh);
                     if (PR_CHECKCARTONW != "0" && pa_standardqty.Text == pa_currentqty.Text)

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -306,6 +306,23 @@ namespace UAS_MES.Make
                                     cdstepcode = dt.Rows[0][0].ToString();
                                 }
                             }
+                            if (cdstepcode == "")
+                            {
+                                //加严完工判断
+                                if (dh.CheckExist("configs", "code = 'checkpack' and data = '1'"))
+                                {
+                                    string currentdetno = dh.getFieldDataByCondition("craft left join craftdetail on cr_id=cd_crid", "cd_detno", "cr_code='" + cr_code.Text + "' and cr_prodcode='" + ms_prodcode.Text + "' and cd_stepcode='" + ms_stepcode + "'").ToString();
+                                    sql.Clear();
+                                    sql.Append("select cd_stepcode from craft left join craftdetail on cr_id=cd_crid left join step on cd_stepcode=st_code ");
+                                    sql.Append("where cr_code='" + cr_code.Text + "' and cr_prodcode='" + ms_prodcode.Text + "' and cd_detno<='" + currentdetno + "' ");
+                                    sql.Append("and nvl(st_checkpack,0)<>0 order by cd_detno");
+                                    DataTable dt1 = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                                    if (dt1.Rows.Count > 0)
+                                    {
+                                        cdstepcode = dt1.Rows[0][0].ToString();
+                                    }
+                                }
+                            }
                             //如果ms_stepcode和扣料工序均没有查到返修的工序
                             if (cdstepcode == "")
                             {

UAS-MES/FunctionCode/Make/Make_SMTStencil.cs

@@ -136,8 +136,8 @@ namespace UAS_MES.Make
                     {
                         string em_name = dt.Rows[0]["em_name"].ToString();
                         sql.Clear();
-                        sql.Append("insert into StencilUse(su_id,SU_USEPRODCODE,su_stid,su_linecode,su_stcode,su_usedate,su_useman,SU_USEMANCODE,SU_TABLE,su_usemacode,su_singlepringqty,su_stverison,SU_STATUS)");
-                        sql.Append("select StencilUse_seq.nextval,'" + ma_prodcode.Text + "',st_id,'" + li_code.Text + "','" + SU_DEVCODE.Text + "',sysdate,'" + em_name + "','" + em_code.Text + "','" + st_table.Text + "','" + ma_code.Text + "'");
+                        sql.Append("insert into StencilUse(su_id,SU_USEPRODCODE,SU_CLEANNUMS,su_stid,su_linecode,su_stcode,su_usedate,su_useman,SU_USEMANCODE,SU_TABLE,su_usemacode,su_singlepringqty,su_stverison,SU_STATUS)");
+                        sql.Append("select StencilUse_seq.nextval,'" + ma_prodcode.Text + "',ST_CLEANNUMS,st_id,'" + li_code.Text + "','" + SU_DEVCODE.Text + "',sysdate,'" + em_name + "','" + em_code.Text + "','" + st_table.Text + "','" + ma_code.Text + "'");
                         sql.Append(",'" + su_singlepringqty1.Text + "',st_version,'在线' from ");
                         sql.Append("Stencil where st_code='" + SU_DEVCODE.Text + "'");
                         dh.ExecuteSql(sql.ToString(), "insert");
@@ -191,7 +191,7 @@ namespace UAS_MES.Make
                     if (int.Parse(st_combinenumber.Text) >= 0)
                     {
                         sql.Clear();
-                        sql.Append("update StencilUse set SU_BACKDATE=sysdate,su_returnman='" + dt.Rows[0]["em_name"].ToString() + "',su_returnmancode='" + em_code1.Text + "',");
+                        sql.Append("update StencilUse set  su_cleannums=nvl(su_cleannums,0)+1, SU_BACKDATE=sysdate,su_returnman='" + dt.Rows[0]["em_name"].ToString() + "',su_returnmancode='" + em_code1.Text + "',");
                         sql.Append("SU_THISUSETIMES='" + (st_combinenumber.Text == "" ? "0" : st_combinenumber.Text) + "',SU_STATUS='借出',su_usecount=" + (St_USECOUNT == "" ? "0" : St_USECOUNT) + "+" + st_combinenumber.Text);
                         sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='在线')");
                         dh.ExecuteSql(sql.ToString(), "update");

UAS-MES/FunctionCode/Make/Make_SMTStockStencil.cs

@@ -101,9 +101,9 @@ namespace UAS_MES.Make
                 return;
             }
             sql.Clear();
-            sql.Append("insert into StencilUse(su_id,su_stid,su_stcode,su_stockusedate,su_useman,SU_USEMANCODE,su_stverison,SU_STATUS)");
+            sql.Append("insert into StencilUse(su_id,su_stid,su_stcode,su_stockusedate,su_useman,SU_USEMANCODE,su_stverison,SU_STATUS,SU_CLEANNUMS)");
             sql.Append("select StencilUse_seq.nextval,st_id,'" + SU_DEVCODE.Text + "',sysdate,'" + User.UserName + "','" + User.UserCode + "'");
-            sql.Append(",st_version,'借出' from ");
+            sql.Append(",st_version,'借出',ST_CLEANNUMS from ");
             sql.Append("Stencil where st_code='" + SU_DEVCODE.Text + "'");
             dh.ExecuteSql(sql.ToString(), "insert");
             dh.ExecuteSql("update Stencil set ST_USESTATUS='借出' where st_code='" + SU_DEVCODE.Text + "'", "update");
@@ -145,9 +145,9 @@ namespace UAS_MES.Make
                         return;
                     }
                     sql.Clear();
-                    sql.Append("update StencilUse set su_returnman='" + User.UserName + "',SU_STOCKBACKDATE=sysdate,SU_ENSIONA='" + ST_ENSIONA.Text + "',SU_ENSIONB='" + ST_ENSIONB.Text + "',SU_ENSIONC='" + ST_ENSIONC.Text + "',SU_ENSIOND='" + ST_ENSIOND.Text + "',");
+                    sql.Append("update StencilUse set SU_CLEANNUMS = nvl(SU_CLEANNUMS,0)+1,su_returnman='" + User.UserName + "',SU_STOCKBACKDATE=sysdate,SU_ENSIONA='" + ST_ENSIONA.Text + "',SU_ENSIONB='" + ST_ENSIONB.Text + "',SU_ENSIONC='" + ST_ENSIONC.Text + "',SU_ENSIOND='" + ST_ENSIOND.Text + "',");
                     sql.Append("SU_ENSIONE='" + ST_ENSIONE.Text + "',SU_STATUS='在仓'");
-                    sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='借出')");
+                    sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='借出' and su_stockusedate is not null)");
                     dh.ExecuteSql(sql.ToString(), "update");
                     sql.Clear();
                     sql.Append("update Stencil set st_cleannums=nvl(st_cleannums,0)+1,ST_USESTATUS='在仓',ST_ENSIONA='" + ST_ENSIONA.Text + "',ST_ENSIONB='" + ST_ENSIONB.Text + "',");

UAS-MES/PublicMethod/LogicHandler.cs

@@ -531,7 +531,7 @@ namespace UAS_MES.PublicMethod
             {
                 sql.Clear();
                 sql.Append("merge into makeserial using mes_package_view on (v_outboxcode='" + iOutBoxCode + "' and ms_sncode=");
-                sql.Append("v_barcode and ms_makecode=v_makecode and ms_status=2) when matched then update set ms_nextstepcode=ms_stepcode");
+                sql.Append("v_barcode and ms_makecode=v_makecode ) when matched then update set ms_nextstepcode=ms_stepcode");
                 sql.Append(",ms_status=1,ms_sccode='" + iSourceCode + "' ");
             }
             ExeSQL.Add(sql.ToString());