Merge branch 'gdasrs' of https://gitee.com/luxiaotao1123/zy-asrs into gdasrs

luxiaotao1123

2020-09-15 5fe9c379f0cc696568a0db249026a1e8a3b02a5a

 src/main/resources/UpdateThread.cs

@@ -835,7 +835,7 @@
                                    goto re;
                                }

                                ///根据工作号，查询工作明细档物料编码
                                ///根据工作号，查询工作明细档产品代号
                                string sqlDetl = "";
                                string sqlWaitIn = "";
                                sql = "select lgnum,tbnum,tbpos,zmatid,matnr,maktx,werks,anfme,altme,zpallet,bname from asr_wrk_detl where wrk_no=" + li_wrk_no;
@@ -910,7 +910,7 @@
                            #endregion
                            #region 拣料再入库
                            case 53:
                                ///根据工作号，查询工作明细档物料编码
                                ///根据工作号，查询工作明细档产品代号
                                sqlDetl = "";
                                sqlWaitIn = "";
                                sql = "select lgnum,tbnum,tbpos,zmatid,matnr,maktx,werks,anfme,altme,zpallet,bname from asr_wrk_detl where wrk_no=" + li_wrk_no;
@@ -964,7 +964,7 @@
                            #endregion
                            #region 并板再入库
                            case 54:
                                ///根据工作号，查询工作明细档物料编码
                                ///根据工作号，查询工作明细档产品代号
                                sqlDetl = "";
                                sqlWaitIn = "";
                                sql = "select lgnum,tbnum,tbpos,zmatid,matnr,maktx,werks,anfme,altme,zpallet,bname from asr_wrk_detl where wrk_no=" + li_wrk_no;
@@ -1030,7 +1030,7 @@
                            #endregion
                            #region 盘点再入库
                            case 57:
                                ///根据工作号，查询工作明细档物料编码
                                ///根据工作号，查询工作明细档产品代号
                                sqlDetl = "";
                                sqlWaitIn = "";
                                sql = "select lgnum,tbnum,tbpos,matnr from asr_wrk_detl where wrk_no=" + li_wrk_no;
@@ -1133,7 +1133,7 @@
                        {
                            #region 全板出库
                            case 101:
                                ///根据工作号，查询工作明细档物料编码
                                ///根据工作号，查询工作明细档产品代号
                                string sqlWaitIn = "";
                                sql = "select lgnum,tbnum,tbpos,matnr from asr_wrk_detl where wrk_no=" + li_wrk_no;
                                DataView dv_wrkdetl = Common.ExecAsrsSelect(sql);
@@ -1375,12 +1375,12 @@
        }

        /// <summary>
        /// 转已完成物料信息到历史档
        /// 转已完成产品信息到历史档
        /// </summary>
        public void ProcMatCodeToLog(string seq)
        {
            string ls_error_memo = "", mat_no = "";
            DisplayInfo(seq, "N", "--处理已完成物料数据转历史档......");
            DisplayInfo(seq, "N", "--处理已完成产品数据转历史档......");
            try
            {
                string condition = " and mat_no not in (select mat_no from asr_loc_detl) and mat_no not in (select mat_no from asr_wrk_detl) ";
@@ -1389,7 +1389,7 @@
                DataView dv = Common.ExecAsrsSelect(sql0);
                if (dv.Count <= 0)
                {
                    DisplayInfo("", "N", "   " + seq + ".1 物料档 [bas_mat_code] 没有资料处理!");
                    DisplayInfo("", "N", "   " + seq + ".1 产品档 [bas_mat_code] 没有资料处理!");
                    return;
                }

@@ -1428,7 +1428,7 @@
                {
                    sqltrans.Rollback();
                    //sqlcommon.Close();
                    ls_error_memo = "   " + seq + ".1 已完成物料数据转历史档错误 ! 异常:" + t.Message;
                    ls_error_memo = "   " + seq + ".1 已完成产品数据转历史档错误 ! 异常:" + t.Message;
                    DisplayInfo("", "E", ls_error_memo);
                }
                finally
@@ -1440,7 +1440,7 @@
            }
            catch (Exception t)
            {
                ls_error_memo = "   " + seq + ".2 已完成物料数据转历史档失败! 异常:" + t.Message;
                ls_error_memo = "   " + seq + ".2 已完成产品数据转历史档失败! 异常:" + t.Message;
                DisplayInfo("", "E", ls_error_memo);
            }
        }
@@ -1539,7 +1539,7 @@
                {
                    sqltrans1.Rollback();
                    //sqlcommon.Close();
                    ls_error_memo = "   " + seq + ".1 已完成物料数据转历史档错误 ! 异常:" + t.Message;
                    ls_error_memo = "   " + seq + ".1 已完成产品数据转历史档错误 ! 异常:" + t.Message;
                    DisplayInfo("", "E", ls_error_memo);
                }
                finally
@@ -1707,7 +1707,7 @@
                    //堆垛机&PLC命令转历史档
                    ProcDevCommandToLog("4"); // done

                    //转已完成物料信息到历史档
                    //转已完成产品信息到历史档
                    //ProcMatCodeToLog("5");
                    //转出库完成待出库档数据到历史档
                    ProcCheckToWorkData("5");