更新DevSN成SN,装箱界面修改

UAS_MES_HYSX/FunctionCode/Make/Make_ColorBoxLabelPrintZX.cs

@@ -204,7 +204,7 @@ namespace UAS_MES_NEW.Make
                             OperateResult.AppendText(">>序列号" + sncode.Text + "所属工单号" + oMakeCode + "与界面工单号" + ma_code.Text + "不同,无法采集\n", Color.Red, sncode);
                             return;
                         }
-                        HttpServer.GetEN(sncode.Text);
+                        string dev_no = HttpServer.GetEN(sncode.Text);
                         //获取工单的其他信息
                         sql.Clear();
                         sql.Append("select ma_code,nvl(ma_unlimitin,0)ma_unlimitin,pr_code,pr_detail,pr_spec from  ");
@@ -293,6 +293,7 @@ namespace UAS_MES_NEW.Make
                                 {
                                     LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, pr_code.Text, Remark.Text);
                                 }
+                                dh.ExecuteSql("update makeserial set ms_sncode='" + dev_no + "' where ms_id='" + oMsID + "'", "update");
                                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒打印", "彩盒打印成功", sncode.Text, "");
                                 //刷新打印数量和剩余数量
                                 dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,mcd_okqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");

UAS_MES_HYSX/FunctionCode/Make/Make_FeedingCollection.cs

@@ -264,35 +264,11 @@ namespace UAS_MES_NEW.Make
                 OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, code);
                 return;
             }
-            dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei1='" + code.Text + "' order by ms_id desc", "select");
+            dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_code='" + code.Text + "' or ms_sncode='"+code.Text+"' order by ms_id desc", "select");
             if (dt.Rows.Count > 0)
             {
                 code.Text = dt.Rows[0]["ms_sncode"].ToString();
             }
-            else
-            {
-                dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + code.Text + "' order by ms_id desc", "select");
-                if (dt.Rows.Count > 0)
-                {
-                    code.Text = dt.Rows[0]["ms_sncode"].ToString();
-                }
-                else
-                {
-                    dt = (DataTable)dh.ExecuteSql("select mil_sncode from makeimeilist where mil_imei1='" + code.Text + "' order by mil_id desc", "select");
-                    if (dt.Rows.Count > 0)
-                    {
-                        code.Text = dt.Rows[0]["mil_sncode"].ToString();
-                    }
-                    else
-                    {
-                        dt = (DataTable)dh.ExecuteSql("select mil_sncode from makeimeilist where mil_imei2='" + code.Text + "' order by mil_id desc", "select");
-                        if (dt.Rows.Count > 0)
-                        {
-                            code.Text = dt.Rows[0]["mil_sncode"].ToString();
-                        }
-                    }
-                }
-            }
             if (LogicHandler.CheckStepSNAndMacode(oMakeCode, User.UserSourceCode, code.Text, User.UserCode, out oMakeCode, out oMsid, out ErrorMessage))
             {
                 if (!LogicHandler.CheckDiffMakeCodeAfterStepCheck(code.Text, oMakeCode, NoteForChange.Checked, NoteAlready, ma_code, out ErrorMessage))

UAS_MES_HYSX/FunctionCode/Packing/Packing_PackageCollectionZX.cs

@@ -219,11 +219,11 @@ namespace UAS_MES_NEW.Packing
             {
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                 {
-                    dt = (DataTable)dh.ExecuteSql("select ZD_SN from ZTEDATA where ZD_DEV_EN_NO='" + sn_code.Text + "'", "select");
-                    if (dt.Rows.Count > 0)
-                    {
-                        sn_code.Text = dt.Rows[0]["ZD_SN"].ToString();
-                    }
+                    //dt = (DataTable)dh.ExecuteSql("select ZD_SN from ZTEDATA where ZD_DEV_EN_NO='" + sn_code.Text + "'", "select");
+                    //if (dt.Rows.Count > 0)
+                    //{
+                    //    sn_code.Text = dt.Rows[0]["ZD_SN"].ToString();
+                    //}
                     dt = (DataTable)dh.ExecuteSql("select ms_status,ms_id,ms_makecode,ms_nextstepcode,ms_craftcode,ms_prodcode from makeserial where ms_sncode ='" + sn_code.Text + "' order by ms_id desc", "select");
                     if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sn_code.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage) || (dt.Rows.Count > 0 && dt.Rows[0]["ms_status"].ToString() == "2"))
                     {
@@ -245,13 +245,13 @@ namespace UAS_MES_NEW.Packing
                                 return;
                             }
                         }
-                        string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsID + "'").ToString();
-                        if (nextstepcode != "" && nextstepcode != User.CurrentStepCode)
-                        {
-                            string stname = dh.getFieldDataByCondition("step", "st_name", "st_code='" + nextstepcode + "'").ToString();
-                            OperateResult.AppendText("<<序列号:" + sn_code.Text + "下一工序是" + stname + ",不是当前岗位的工序\n", Color.Red, sn_code);
-                            return;
-                        }
+                        //string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsID + "'").ToString();
+                        //if (nextstepcode != "" && nextstepcode != User.CurrentStepCode)
+                        //{
+                        //    string stname = dh.getFieldDataByCondition("step", "st_name", "st_code='" + nextstepcode + "'").ToString();
+                        //    OperateResult.AppendText("<<序列号:" + sn_code.Text + "下一工序是" + stname + ",不是当前岗位的工序\n", Color.Red, sn_code);
+                        //    return;
+                        //}
                         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();

UAS_MES_HYSX/PublicMethod/HttpServer.cs

@@ -287,9 +287,9 @@ namespace UAS_MES_NEW.PublicMethod
         }
 
         //获取SN的EN号，彩盒标机身标一个工站一起打印，需要SN单个获取
-        public static void GetEN(string iSN)
+        public static string GetEN(string iSN)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select ma_custpo,ms_makecode,pr_prefix,PREFIX_EN_NO,PREFIX_BIG_BOX,pr_prebigxbox,pr_regcode from makeserial left join product on ms_prodcode=pr_code left join make on ma_code=ms_makecode left join ZTE_ORDER on ma_custpo=po_sn where ms_sncode ='" + iSN + "' or ms_firstsn='" + iSN + "' order by ms_id desc", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_id,ma_custpo,ms_makecode,pr_prefix,PREFIX_EN_NO,PREFIX_BIG_BOX,pr_prebigxbox,pr_regcode from makeserial left join product on ms_prodcode=pr_code left join make on ma_code=ms_makecode left join ZTE_ORDER on ma_custpo=po_sn where ms_sncode ='" + iSN + "' or ms_firstsn='" + iSN + "' order by ms_id desc", "select");
             string prefix = "";
             string regcode = "";
             string makecode = "";
@@ -339,9 +339,10 @@ namespace UAS_MES_NEW.PublicMethod
             {
                 dh.ExecuteSql("delete from ZTEDATA where zd_sn='" + iSN + "' and zd_makecode='" + makecode + "' and zd_type='彩盒机身标'", "delete");
             }
-            dh.ExecuteSql("update makeserial set ms_sncode='" + dev_en_no + "' where ms_id='" + ms_id + "'", "update");
+            //dh.ExecuteSql("update makeserial set ms_sncode='" + dev_en_no + "' where ms_id='" + ms_id + "'", "update");
             dh.ExecuteSql("insert into ZTEDATA(ZD_ID,ZD_D_SN,zd_WholeDeviceCode,ZD_DEV_EN_NO,ZD_SN, ZD_MAKECODE, ZD_TYPE, ZD_VALUE,zd_mac,ZD_MAC_START, ZD_MAC_END,ZD_RESERVE3,zd_enno,zd_devicetype,zd_regcode)" +
                 "values(ZTEDATA_seq.nextval,'" + SN + "','" + WholeDeviceCode + "','" + dev_en_no + "','" + iSN + "','" + makecode + "','彩盒机身标','','" + mac + "','" + mac_start + "','" + mac_end + "','" + reserve3 + "','" + en_no + "','" + device_type + "','" + reg_code + "')", "insert");
+            return dev_en_no;
         }
 
         private string HandleWebException(WebException ex)
@@ -641,6 +642,7 @@ namespace UAS_MES_NEW.PublicMethod
         }
         public static void GetOutBoxInf_Thailand(string iBox)
         {
+
         }
 
         public static readonly uint PROTOCOL_FLAG = 0x4C4F4F54;

UAS_MES_HYSX/PublicMethod/Print.cs

@@ -260,8 +260,8 @@ namespace UAS_MES_NEW.PublicMethod
                     dt = (DataTable)dh.ExecuteSql("select lpl_id from labelprintlog where lpl_value='" + SnCode + "' and lpl_type='" + LabelType + "'", "select");
                     if (dt.Rows.Count == 0)
                     {
-                        ErrorMessage = SnCode + LabelType + "未打印，不允许补打";
-                        return false;
+                        //ErrorMessage = SnCode + LabelType + "未打印，不允许补打";
+                        //return false;
                     }
                 }
             }
@@ -495,8 +495,8 @@ namespace UAS_MES_NEW.PublicMethod
                     dt = (DataTable)dh.ExecuteSql("select lpl_id from labelprintlog where lpl_value='" + SnCode + "' and lpl_type='" + LabelType + "'", "select");
                     if (dt.Rows.Count == 0)
                     {
-                        ErrorMessage = SnCode + LabelType + "未打印，不允许补打";
-                        return false;
+                        //ErrorMessage = SnCode + LabelType + "未打印，不允许补打";
+                        //return false;
                     }
                 }
             }
@@ -652,6 +652,5 @@ namespace UAS_MES_NEW.PublicMethod
             LogicHandler.doLabelPrintLog(SnCode, LabelType, MakeCode, ProdCode, User.UserSourceCode, User.CurrentStepCode, IfRePrint, User.UserCode, PrintFile.Name);
             return true;
         }
-
     }
 }