Merge branch 'master' of ssh://10.10.101.21/source/mes-client

TestProject/tool/MES接口.XML

@@ -1,562 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>MES接口</name>
-    </assembly>
-    <members>
-        <member name="M:MES接口.ftpOperater.GetFileList">
-            <summary>
-            获取ftp服务器上的文件信息
-            </summary>
-            <returns>存储了所有文件信息的字符串数组</returns>
-        </member>
-        <member name="M:MES接口.ftpOperater.GetFileSize(System.String)">
-            <summary>
-            获取FTP上指定文件的大小
-            </summary>
-            <param name="filename">文件名</param>
-            <returns>文件大小</returns>
-        </member>
-        <member name="M:MES接口.ftpOperater.Download(System.String)">
-            <summary>
-            实现ftp下载操作
-            </summary>
-            <param name="fileName">远程文件名</param>
-        </member>
-        <member name="T:MES接口.LogicHandler">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:MES接口.LogicHandler.#ctor">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:MES接口.LogicHandler.CheckUserLogin(System.String,System.String,System.String@)">
-            <summary>
-            验证用户身份信息
-            </summary>
-            <param name="iUserCode"></param>
-            <param name="iPassWord"></param>
-            <param name="oErrorMessage"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.LogicHandler.CheckUserLoginAndSource(System.String,System.String,System.String,System.String@)">
-            <summary>
-            验证用户身份信息和岗位资源
-            </summary>
-            <param name="iUserCode"></param>
-            <param name="iPassWord"></param>
-            <param name="iUserSource"></param>
-            <param name="oErrorMessage"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.LogicHandler.CheckCurrentStep(System.String,System.String,System.String,System.String,System.String@)">
-            <summary>
-            检测当前工序是否正确
-            </summary>
-            <param name="iSnCode"></param>
-            <param name="iMakeCode"></param>
-            <param name="iSource"></param>
-            <param name="iCaller"></param>
-            <param name="oErrorMessage"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.LogicHandler.GetOQCBatch(System.String,System.String,System.String,System.String,System.String@)">
-            <summary>
-            获取送检批次,根据不同的iOQCStep执行不同的操作，查询到有具体的信息时返回Form和Detail的两个DataTable
-             iOQCStep 有四个固定参数
-             OQCSENDCHECK 生成送检批
-             OQCPLANMAINTAIN 抽样计划维护
-             OQCDATACOLLECTION 抽样数据采集
-             OQCRESULTDETERMINE 批结果判定
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.LogicHandler.GetBatch(System.String,System.String,System.String@)">
-            <summary>
-             第一个是Form的主表信息，第二个是Grid的信息
-            </summary>
-            <param name="iCheckNo"></param>
-            <param name="iOQCStep"></param>
-            <param name="oErrorMessage"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.LogicHandler.CheckNextStepIfQC(System.String,System.String,System.String,System.String,System.String@)">
-            <summary>
-            判断下一工序是否是送检工序
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.LogicHandler.SetTestDetail(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String@)">
-            <summary>
-            方法说明：测试详细信息录入系统，针对一个SN多个测试项目结果可循环调用
-            </summary>
-            <param name="iSNCode"></param>
-            <param name="iMakeCode"></param>
-            <param name="iClass"></param>
-            <param name="iSubClass1"></param>
-            <param name="iSubClass2"></param>
-            <param name="iSubClass3"></param>
-            <param name="iMaxValue"></param>
-            <param name="iMinValue"></param>
-            <param name="iActualValue"></param>
-            <param name="iValue1"></param>
-            <param name="iValue2"></param>
-            <param name="iValue3"></param>
-            <param name="iTestResult"></param>
-            <param name="iSource"></param>
-            <param name="oErrMessage"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.LogicHandler.GetAddressRangeByMakeCode(System.String,System.String,System.String@,System.String@,System.String@,System.String@,System.String@,System.String@)">
-            <summary>
-            分配Mac地址和BT地址
-            </summary>
-            <param name="iSnCode"></param>
-            <param name="iMakeCode"></param>
-            <param name="oMac"></param>
-            <param name="oBT"></param>
-            <param name="oCode1"></param>
-            <param name="oCode2"></param>
-            <param name="oCode3"></param>
-            <param name="oErrorMessage"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.LogicHandler.SetAddressInfo(System.String,System.String,System.String,System.String,System.String,System.String,System.String@)">
-            <summary>
-            保存Mac地址和BT地址
-            </summary>
-            <param name="iSnCode"></param>
-            <param name="iMac"></param>
-            <param name="iBT"></param>
-            <param name="iCode1"></param>
-            <param name="iCode2"></param>
-            <param name="iCode3"></param>
-            <param name="oErrMessage"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.LogicHandler.GetIMEIOrNetCodeRange(System.String,System.String,System.String,System.String,System.String@,System.String@,System.String@,System.String@,System.String@,System.String@,System.String@,System.String@,System.String@,System.String@,System.String@,System.String@)">
-            <summary>
-            输入的 SN 号查找在制品是否有 IMEI 信息存在，如果存在则将 IMEI 信息传出，如果没有则在该工单下未使用的 IMEI 中随机分配一组
-            如果iIMEI1、iNetCode不为空，则分别作为获取的附件加条件。
-            </summary>
-            <param name="iSnCode"></param>
-            <param name="iMakeCode"></param>
-            <param name="iIMEI1"></param>
-            <param name="iNetCode"></param>
-            <param name="oIMEI1"></param>
-            <param name="oIMEI2"></param>
-            <param name="oIMEI3"></param>
-            <param name="oMEID"></param>
-            <param name="oNetCode"></param>
-            <param name="oPSN"></param>
-            <param name="oMac"></param>
-            <param name="oBT"></param>
-            <param name="oCode1"></param>
-            <param name="oCode2"></param>
-            <param name="oCode3"></param>
-            <param name="oErrorMessage"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.LogicHandler.SetIMEIInfo(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String@)">
-            <summary>
-            作业调用该方法将确认接收SN对应的IMEI及附属信息。
-            </summary>
-            <param name="iSnCode"></param>
-            <param name="iMakeCode"></param>
-            <param name="iIMEI1"></param>
-            <param name="iIMEI2"></param>
-            <param name="iIMEI3"></param>
-            <param name="iMEID"></param>
-            <param name="iNetCode"></param>
-            <param name="iPSN"></param>
-            <param name="iMac"></param>
-            <param name="iBT"></param>
-            <param name="iCode1"></param>
-            <param name="iCode2"></param>
-            <param name="iCode3"></param>
-            <param name="oErrorMessage"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.LogicHandler.GetSNAllInfo(System.String,System.String@,System.String@,System.String@,System.String@,System.String@,System.String@,System.String@,System.String@,System.String@,System.String@,System.String@,System.String@)">
-            <summary>
-            获取序列号的所有串号信息
-            </summary>
-            <param name="iSnCode"></param>
-            <param name="oIMEI1"></param>
-            <param name="oIMEI2"></param>
-            <param name="oIMEI3"></param>
-            <param name="oMEID"></param>
-            <param name="oNetCode"></param>
-            <param name="oPSN"></param>
-            <param name="oMac"></param>
-            <param name="oBT"></param>
-            <param name="oCode1"></param>
-            <param name="oCode2"></param>
-            <param name="oCode3"></param>
-            <param name="oErrorMessage"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.LogicHandler.SetTestResult(System.String,System.String,System.String,System.String,System.String,System.String@)">
-            <summary>
-            设置良品采集结果
-            </summary>
-            <param name="iSnCode"></param>
-            <param name="iMakeCode"></param>
-            <param name="iSource"></param>
-            <param name="iUserName"></param>
-            <param name="iResult"></param>
-            <param name="oErrorMessage"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.LogicHandler.SetTestNGDetail(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.String@)">
-            <summary>
-            执行不良信息采集
-            </summary>
-            <param name="iSnCode"></param>
-            <param name="iMakeCode"></param>
-            <param name="iUserName"></param>
-            <param name="iSource"></param>
-            <param name="iResult"></param>
-            <param name="iBadCode"></param>
-            <param name="iBadRemark"></param>
-            <param name="oErrorMessage"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.LogicHandler.SetCollectionFinish(System.String,System.String,System.String,System.String,System.String)">
-            <summary>
-            已有StepCode和StepName的情况下类的内部调用
-            </summary>
-            <param name="iSnCode"></param>
-            <param name="iMakeCode"></param>
-            <param name="iUserName"></param>
-            <param name="StepCode"></param>
-            <param name="StepName"></param>
-        </member>
-        <member name="M:MES接口.LogicHandler.GetMakeInfo(System.String,System.String@,System.String@)">
-            <summary>
-            获取工单的最近一条执行记录
-            </summary>
-            <param name="iSnCode"></param>
-            <param name="oMakeCode"></param>
-            <param name="oErrorMessage"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.LogicHandler.SetCollectionFinish(System.String,System.String,System.String,System.String,System.String@)">
-            <summary>
-            判断是否扣料工序，执行扣料，执行上料表记录
-            </summary>
-            <param name="iSnCode"></param>
-            <param name="iMakeCode"></param>
-            <param name="iUserName"></param>
-            <param name="iSource"></param>
-            <param name="oErrorMessage"></param>
-        </member>
-        <member name="M:MES接口.LogicHandler.InsertMessageLog(System.String,System.String,System.String,System.String,System.String)">
-            <summary>
-            记录一般操作日志
-            </summary>
-            <param name="inMan"></param>
-            <param name="Content"></param>
-            <param name="Result"></param>
-            <param name="Search"></param>
-            <param name="Code"></param>
-        </member>
-        <member name="M:MES接口.LogicHandler.SetMaterialUp(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String@)">
-            <summary>
-            上料采集
-            </summary>
-            <param name="iSnCode"></param>
-            <param name="iMakeCode"></param>
-            <param name="iBarcode"></param>
-            <param name="iSonCode"></param>
-            <param name="iSource"></param>
-            <param name="iUserName"></param>
-            <param name="iSonID"></param>
-            <param name="iType"></param>
-            <param name="oErrorMessage"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.LogicHandler.SetMaterialDown(System.String,System.String,System.String,System.String,System.String@)">
-            <summary>
-            执行下料操作
-            </summary>
-            <param name="iSnCode"></param>
-            <param name="iBarCode"></param>
-            <param name="iCurrentStep"></param>
-            <param name="iUserName"></param>
-            <param name="oErrorMessage"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.LogicHandler.GetStepCodeAndNameAndLineBySource(System.String,System.String@,System.String@,System.String@)">
-            <summary>
-            获取执行步骤代码，名称和线别
-            </summary>
-            <param name="Source"></param>
-            <param name="StepCode"></param>
-            <param name="StepName"></param>
-            <param name="LineCode"></param>
-        </member>
-        <member name="M:MES接口.LogicHandler.GetStepCodeAndNameBySource(System.String,System.String@,System.String@)">
-            <summary>
-            获取步骤代码和名称
-            </summary>
-            <param name="Source"></param>
-            <param name="StepCode"></param>
-            <param name="StepName"></param>
-        </member>
-        <member name="M:MES接口.LogicHandler.GetStepCodeBySource(System.String)">
-            <summary>
-            获取步骤代码
-            </summary>
-            <param name="Source"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.LogicHandler.CheckIfFirstMakeSerial(System.String,System.String,System.String)">
-            <summary>
-            判断当前工序是否是第一道工序
-            </summary>
-            <param name="iSncode"></param>
-            <param name="iMakecode"></param>
-            <param name="iSource"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.LogicHandler.InsertMakeProcess(System.String,System.String,System.String,System.String)">
-            <summary>
-             记录操作日志
-            </summary>
-            <param name="iSnCode"></param>
-            <param name="iMakeCode"></param>
-            <param name="result"></param>
-            <param name="iUserName"></param>
-        </member>
-        <member name="M:MES接口.LogicHandler.UpDateNextStepCode(System.String,System.String)">
-            <summary>
-            更新到下一步骤
-            </summary>
-            <param name="iSnCode"></param>
-            <param name="iMakeCode"></param>
-        </member>
-        <member name="M:MES接口.LogicHandler.AddField(System.String[])">
-            <summary>
-            
-            </summary>
-            <param name="Fields"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.DataHelper.#ctor">
-            <summary>
-            执行构造函数的时候打开数据库的链接
-            </summary>
-        </member>
-        <member name="M:MES接口.DataHelper.GetColumnDataType(System.String)">
-            <summary>
-            根据表名获取该表字段数据类型
-            </summary>
-        </member>
-        <member name="M:MES接口.DataHelper.getFieldDataByCondition(System.String,System.String,System.String)">
-            <summary>
-            获取第一行第一列的信息
-            </summary>
-        </member>
-        <member name="M:MES接口.DataHelper.ExecutePrintSQL(System.String,System.String[])">
-            <summary>
-            执行打印的SQL
-            </summary>
-            <param name="SQL">SQL语句</param>
-            <param name="Parameters">动态添加的参数，主要根据条码枪扫描获取</param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.DataHelper.getRowCount(System.String,System.String)">
-            <summary>
-            获取指定表的记录的条数 ,带条件
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.DataHelper.getRowCount(System.String)">
-            <summary>
-            获取指定表的记录的条数 ,不带条件
-            </summary>
-            <param name="TableName"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.DataHelper.getFieldsDataByCondition(System.String,System.String[],System.String)">
-            <summary>
-            通过表名和获取单行的记录
-            </summary>
-        </member>
-        <member name="M:MES接口.DataHelper.InsertDataTable(System.Data.DataTable,System.String)">
-            <summary>
-            将DataTable导入到指定的表中
-            </summary>
-            <param name="DataTable"></param>
-            <param name="TableName"></param>
-        </member>
-        <member name="M:MES接口.DataHelper.getFieldsDatasByPageing(System.String,System.String,System.Int32,System.Int32,System.String,System.String[])">
-            <summary>
-            按分页获取数据
-            </summary>
-            <param name="TableName">表名</param>
-            <param name="Fields">查询字段</param>
-            <param name="CurrentPage">当前页面</param>
-            <param name="PageSize">页面展示条数</param>
-            <param name="Caller"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.DataHelper.getFieldsDatasByCondition(System.String,System.String[],System.String)">
-            <summary>
-            通过表名，字段和条件获取DataTable类型的数据
-            </summary>
-        </member>
-        <member name="M:MES接口.DataHelper.getFieldsDatas(System.String,System.String)">
-            <summary>
-            通过表名，字段获取DataTable类型的数据
-            </summary>
-        </member>
-        <member name="M:MES接口.DataHelper.UpDateTableByCondition(System.Data.DataTable,System.String,System.String,System.String[])">
-            <summary>
-            根据DataTable和指定的表名更新数据,如果需要保存新增的数据则需要传递一条Insert的SQL
-            </summary>
-            <param name="DataTable"></param>
-            <param name="TableName"></param>
-            <param name="Condition"></param>
-        </member>
-        <member name="M:MES接口.DataHelper.GetDbFindDataTable(System.String,System.String)">
-            <summary>
-            获取DbFind的数据的DataTable的结构
-            </summary>
-            <param name="field"></param>
-            <param name="caller"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.DataHelper.GetConfigureData(System.String,System.String,System.String)">
-            <summary>
-             获取配置列表中的数据，支持DaatList,Form,DetailGrid
-            </summary>
-            <param name="Caller"></param>
-            <param name="Type"></param>
-            <param name="condition"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.DataHelper.GetConfigureData(System.String,System.String)">
-            <summary>
-            查询配置的字段,Type是查询DataList，Form还是DetailGrid
-            </summary>
-            <param name="Caller"></param>
-            <param name="Type"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.DataHelper.CheckExist(System.String,System.String)">
-            <summary>
-            检测内容是否存在
-            </summary>
-            <param name="TableName"></param>
-            <param name="Condition"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.DataHelper.ExecuteSql(System.String,System.String,System.Object[])">
-            <summary>
-            直接执行SQL，同时传入SQL的类型
-            </summary>
-            <param name="SQL"></param>
-            <param name="Type"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.DataHelper.CheckSQL(System.String)">
-            <summary>
-            为了同步BS端的条码维护，检测时允许问号的存在，在检测时默认将问号换成:Param参数
-            </summary>
-            <param name="SQL"></param>
-        </member>
-        <member name="M:MES接口.DataHelper.GetSerialNumberByCaller(System.String)">
-            <summary>
-            根据Caller获取流水号
-            </summary>
-            <param name="Caller"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.DataHelper.DeleteDataByID(System.String,System.String,System.String[])">
-            <summary>
-            根据主键ID删除表的数据
-            </summary>
-            <param name="TableName">表名</param>
-            <param name="ID">主键</param>
-            <param name="DeleteID">需要删除主键ID的数组</param>
-        </member>
-        <member name="M:MES接口.DataHelper.GetSEQ(System.String)">
-            <summary>
-            通过序列的名称获取序列
-            </summary>
-            <param name="SeqName"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.DataHelper.BatchInsert(System.String,System.Object[][])">
-            <summary>
-            批量通过SQL来执行插入操作 ，参数的第一个数一个string[]数组，用来传递需要添加的参数的名称
-            之后的是名称参数数组对应的 ，所有的插入参数数据长度必须是一致的
-            </summary>
-            <param name="sql"></param>
-            <param name="names"></param>
-        </member>
-        <member name="M:MES接口.DataHelper.GetDataList(System.String,System.String)">
-            <summary>
-            查询DataList配置的字段
-            </summary>
-            <param name="TableName"></param>
-            <param name="Caller"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.DataHelper.GetConfig(System.String,System.String)">
-            <summary>
-            取Configs表中的配置，进行该客户是否执行某个操作
-            </summary>
-            <param name="Code"></param>
-            <param name="Caller"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.DataHelper.UpdateByCondition(System.String,System.String,System.String)">
-            <summary>
-            通过条件更新
-            </summary>
-            <param name="TableName"></param>
-            <param name="update"></param>
-            <param name="condition"></param>
-        </member>
-        <member name="M:MES接口.DataHelper.CallProcedure(System.String,System.String[])">
-            <summary>
-            调用存储过程
-            </summary>
-            <param name="ProcedureName"></param>
-            <param name="param"></param>
-        </member>
-        <member name="M:MES接口.DataHelper.ExecuteSQLTran(System.String[])">
-            <summary>
-            出现异常进行回滚的执行方法
-            </summary>
-            <param name="SQL"></param>
-        </member>
-        <member name="M:MES接口.DataHelper.AddField(System.String[])">
-            <summary>
-            用于将string 的数组转换成SQL的查询内容
-            </summary>
-            <param name="Fields"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.DataHelper.GetCaptionFromField(System.String)">
-            <summary>
-            通过查询的内容获取到字段的描述
-            </summary>
-            <param name="field"></param>
-            <returns></returns>
-        </member>
-        <member name="M:MES接口.DataHelper.GetField(System.String)">
-            <summary>
-            通过查询的语句获取查询的字段
-            </summary>
-            <param name="field"></param>
-            <returns></returns>
-        </member>
-    </members>
-</doc>

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -291,7 +291,7 @@ namespace UAS_MES.Make
             OperateResult.AppendText(">>批次" + ob_checkno.Text + "送检成功\n", Color.Green);
             LogicHandler.InsertMakeProcess(sncode.Text, ms_makecode.Text, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
             //记录操作日志
-            LogicHandler.DoCommandLog(User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "手动送检", "手动送检成功", "", ob_checkno.Text);
+            LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "手动送检", "手动送检成功", "", ob_checkno.Text);
             ob_checkno.Text = "";
         }
 

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -69,7 +69,7 @@ namespace UAS_MES.Make
             ma_code.SelectField = "ma_code # 工单号,ma_prodcode # 产品编号,ma_qty # 工单数量,ma_craftcode # 途程编号,pr_detail # 产品名称,ma_bomversion # Bom版本";
             ma_code.FormName = Name;
             ma_code.DBTitle = "工单查询";
-            ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "ma_qty", "pr_detail", "ma_craftcode","ma_bomversion" };
+            ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "ma_qty", "pr_detail", "ma_craftcode", "ma_bomversion" };
             ma_code.Condition = "ma_statuscode='STARTED'";
             ma_code.DbChange += Ma_code_DBChange;
             dh = new DataHelper();
@@ -159,6 +159,7 @@ namespace UAS_MES.Make
                                                     sql.Append("'" + User.CurrentStepCode + "' and ms_sncode='" + code.Text + "'");
                                                     dh.ExecuteSql(sql.GetString(), "insert");
                                                     sn_code.Text = code.Text;
+                                                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "上料采集", "上料采集成功", sn_code.Text, "");
                                                     OperateResult.AppendText(">>序列号" + code.Text + "上料成功\n", Color.Green);
                                                     RemainIndex = RemainIndex + 1;
                                                     GetCollectItem();
@@ -227,18 +228,25 @@ namespace UAS_MES.Make
                     {
                         if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, code.Text, User.UserCode, out oMakeCode, out oMsid, out ErrorMessage))
                         {
-                            dt = (DataTable)dh.ExecuteSql("select cm_id,cm_stepcode,ms_makecode,cm_mccode from craftmaterial left join makeserial on cm_makecode=ms_makecode and cm_sncode=ms_sncode where ms_sncode='" + code.Text + "' and cm_makecode='" + ma_code.Text + "'", "select");
+                            dt = (DataTable)dh.ExecuteSql("select nvl(cm_status,0)cm_status,cm_id,cm_stepcode,ms_makecode,cm_mccode,cm_materialtype from craftmaterial left join makeserial on cm_makecode=ms_makecode and cm_sncode=ms_sncode where ms_sncode='" + code.Text + "' and cm_makecode='" + ma_code.Text + "'", "select");
                             if (dt.Rows.Count > 0)
                             {
                                 string ms_macode = dt.Rows[0]["ms_makecode"].ToString();
                                 string cm_stepcode = dt.Rows[0]["cm_stepcode"].ToString();
                                 string cm_mccode = dt.Rows[0]["cm_mccode"].ToString();
-                                dh.ExecuteSql("delete from craftmaterial where cm_sncode='" + code.Text + "' and cm_makecode='" + ma_code.Text + "'", "delete");
-                                LogicHandler.InsertMakeProcess(ms_macode, code.Text, User.UserSourceCode, "上料采集操作", "下料成功", User.UserCode);
-                                int count = dh.getRowCount("craftMaterial", "cm_mccode='" + cm_mccode + "' and cm_stepcode='" + cm_stepcode + "' and cm_sncode='" + code.Text + "'");
-                                if (count == 0)
-                                    dh.UpdateByCondition("makecraftdetail ", "mcd_inqty=mcd_inqty-1,mcd_outqty=mcd_outqty-1,mcd_okqty = mcd_okqty - 1", "mcd_mccode='" + cm_mccode + "' and mcd_stepcode='" + cm_stepcode + "'");
-                                OperateResult.AppendText(">>序列号" + code.Text + "下料成功\n", Color.Green, code);
+                                string cm_materialtype = dt.Rows[0]["cm_materialtype"].ToString();
+                                string cm_status = dt.Rows[0]["cm_status"].ToString();
+                                if (cm_materialtype == "1" && cm_status == "0")
+                                {
+                                    dh.ExecuteSql("delete from craftmaterial where cm_sncode='" + code.Text + "' and cm_makecode='" + ma_code.Text + "'", "delete");
+                                    LogicHandler.InsertMakeProcess(ms_macode, code.Text, User.UserSourceCode, "上料采集操作", "下料成功", User.UserCode);
+                                    int count = dh.getRowCount("craftMaterial", "cm_mccode='" + cm_mccode + "' and cm_stepcode='" + cm_stepcode + "' and cm_sncode='" + code.Text + "'");
+                                    if (count == 0)
+                                        dh.UpdateByCondition("makecraftdetail ", "mcd_inqty=mcd_inqty-1,mcd_outqty=mcd_outqty-1,mcd_okqty = mcd_okqty - 1", "mcd_mccode='" + cm_mccode + "' and mcd_stepcode='" + cm_stepcode + "'");
+                                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "上料采集", "下料成功", code.Text, "");
+                                    OperateResult.AppendText(">>序列号" + code.Text + "下料成功\n", Color.Green, code);
+                                }
+                                else OperateResult.AppendText(">>序列号" + code.Text + "已被扣料，不允许下料\n", Color.Green, code);
                             }
                             else OperateResult.AppendText(">>该序列号未上料，无需下料\n", Color.Red, code);
                         }
@@ -325,7 +333,7 @@ namespace UAS_MES.Make
             RemainIndex = RemainIndex + 1;
             OperateResult.SelectionColor = Color.Green;
             CollectData.Add(code.Text);
-            OperateResult.AppendText(">>采集成功\n");
+            OperateResult.AppendText(">>物料" + sp_soncode + "采集成功\n");
             code.Clear();
             //如果+1后不小于B序列的长度，则已采集完成，不需要进行提示了
             if (RemainIndex < RemainList.Length)
@@ -361,7 +369,7 @@ namespace UAS_MES.Make
                 //采集成功，设置序列号栏目为空
                 RemainIndex = 0;
                 OperateResult.AppendText(">>上料采集完成！\n", Color.Green);
-                if (LogicHandler.SetTestResult(ma_code, User.UserSourceCode, sn_code.Text, "上料采集", "上料成功", User.UserCode, out ErrorMessage))
+                if (LogicHandler.SetStepResult(ma_code, User.UserSourceCode, sn_code.Text, "上料采集", "上料成功", User.UserCode, out ErrorMessage))
                 {
                     sn_code.Text = "";
                     if (mcd_remainqty.Text == "0")

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -365,7 +365,7 @@ namespace UAS_MES.Make
                 OperateResult.AppendText(">>批次" + ob_checkno.Text + "送检成功\n", Color.Green);
                 LogicHandler.InsertMakeProcess(sn_code.Text, oMakeCode, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
                 //记录操作日志
-                LogicHandler.DoCommandLog(User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "手动送检", "手动送检成功", "", ob_checkno.Text);
+                LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "手动送检", "手动送检成功", "", ob_checkno.Text);
                 ob_checkno.Text = "";
             }
             else OperateResult.AppendText(">>必须封箱才能送检\n", Color.Red);

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -442,7 +442,7 @@ namespace UAS_MES.Make
                 OperateResult.AppendText(">>批次" + ob_checkno.Text + "送检成功\n", Color.Green);
                 LogicHandler.InsertMakeProcess(sn_code.Text, oMakeCode, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
                 //记录操作日志
-                LogicHandler.DoCommandLog(User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "手动送检", "手动送检成功", "", ob_checkno.Text);
+                LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "手动送检", "手动送检成功", "", ob_checkno.Text);
                 ob_checkno.Text = "";
             }
             else OperateResult.AppendText(">>必须封箱才能送检\n", Color.Red);

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -245,7 +245,7 @@ namespace UAS_MES.Make
                 OperateResult.AppendText("<<打印成功\n", Color.Green);
                 Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), Printer.Text, inputValue.Text, int.Parse(printNum.Text), indate[PrintLabel.SelectedIndex]);
                 //打印成功,记录日志commandlog , cl_operate彩盒或者机身标补打印，cl_result补打印成功
-                LogicHandler.DoCommandLog(User.UserCode, "", User.UserLineCode, User.UserSourceCode, giftBox.Checked?"彩盒标补打印":"机身标补打印", "补打印成功", inputValue.Text, "");
+                LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode, "", User.UserLineCode, User.UserSourceCode, giftBox.Checked?"彩盒标补打印":"机身标补打印", "补打印成功", inputValue.Text, "");
                 //如果ms_downstatus<>0，则更新ms_downstatus=-1 where ms_id=?id，同时插入记录至表 MAKEDOWN
                 if (mapB.Rows[0]["ms_downstatus"].ToString()=="0")
                 {
@@ -367,7 +367,7 @@ namespace UAS_MES.Make
                                 dh.ExecuteSQLTran("update makeserial set ms_downstatus='0' where ms_id='" + re_ms_id + "'", sql.GetString());
                             }
                             //记录操作日志commandlog ， 补打核对，核对成功
-                            LogicHandler.DoCommandLog(User.UserCode, "", User.UserLineCode, User.UserSourceCode, "标签补打核对", "核对成功", TSN, "");
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, "", User.UserLineCode, User.UserSourceCode, "标签补打核对", "核对成功", TSN, "");
                         }
                         else
                         {

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -383,7 +383,7 @@ namespace UAS_MES.Make
                     }
                     dh.UpdateByCondition("makebad", "mb_status=-1", "mb_sncode='" + ms_sncode.Text + "'");
                     LogicHandler.InsertMakeProcess(ms_sncode.Text, ms_makecode.Text, User.UserSourceCode, "回流工序", "完成维修回流", User.UserCode);
-                    LogicHandler.DoCommandLog(User.UserCode, macode, User.UserLineCode, User.UserSourceCode, "回流工序", "完成维修回流", ms_sncode.Text, ms_checkno.Text);
+                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, macode, User.UserLineCode, User.UserSourceCode, "回流工序", "完成维修回流", ms_sncode.Text, ms_checkno.Text);
                     OperatResult.AppendText(">>" + ms_sncode.Text + " 序列号回流成功\n", Color.Green);
                     BaseUtil.CleanForm(this);
                     BadCodeTree.Nodes.Clear();
@@ -426,7 +426,7 @@ namespace UAS_MES.Make
                         }
                         dh.UpdateByCondition("make", "MA_NGMADEQTY=nvl(MA_NGMADEQTY,0)+1", "ma_code='" + macode + "'");
                         LogicHandler.InsertMakeProcess(ms_sncode.Text, ms_makecode.Text, User.UserSourceCode, "报废", "序列号报废", User.UserCode);
-                        LogicHandler.DoCommandLog(User.UserCode, macode, User.UserLineCode, User.UserSourceCode, "报废", "序列号报废", ms_sncode.Text, ms_checkno.Text);
+                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, macode, User.UserLineCode, User.UserSourceCode, "报废", "序列号报废", ms_sncode.Text, ms_checkno.Text);
                         OperatResult.AppendText(">>报废成功\n", Color.Green);
                         GetSNCode.Clear();
                         BaseUtil.CleanForm(this);
@@ -488,7 +488,7 @@ namespace UAS_MES.Make
                     sql.Append("'" + bc_code.Text + "','" + nr_code.Text + "','" + GetSNCode.Text + "','" + macode + "',");
                     sql.Append("sysdate,'" + User.UserCode + "','" + User.UserSourceCode + "' from dual");
                     dh.BatchInsert(sql.GetString(), new string[] { "prodcode" }, prodcode.ToArray());
-                    LogicHandler.DoCommandLog(User.UserCode, macode, User.UserLineCode, User.UserSourceCode, "不良零件保存", "不良零件保存成功", ms_sncode.Text, ms_checkno.Text);
+                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, macode, User.UserLineCode, User.UserSourceCode, "不良零件保存", "不良零件保存成功", ms_sncode.Text, ms_checkno.Text);
                 }
                 OperatResult.AppendText(">>不良零件保存成功\n", Color.Green);
             }
@@ -511,7 +511,7 @@ namespace UAS_MES.Make
                     sql.Append(",:location,'" + bc_code.Text + "','" + nr_code.Text + "','" + GetSNCode.Text + "','" + macode + "',");
                     sql.Append("sysdate,'" + User.UserCode + "' from dual");
                     dh.BatchInsert(sql.GetString(), new string[] { "location" }, location.ToArray());
-                    LogicHandler.DoCommandLog(User.UserCode, macode, User.UserLineCode, User.UserSourceCode, "不良位置保存", "不良位置保存成功", ms_sncode.Text, ms_checkno.Text);
+                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, macode, User.UserLineCode, User.UserSourceCode, "不良位置保存", "不良位置保存成功", ms_sncode.Text, ms_checkno.Text);
                 }
                 OperatResult.AppendText(">>不良位置保存成功\n", Color.Green);
             }

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -335,7 +335,7 @@ namespace UAS_MES.Make
                             LastSncode = ms_sncode.Text;
                             OperateResult.AppendText(">>" + ms_sncode.Text + "良品采集成功\n", Color.Green, ms_sncode);
                             //记录操作日志
-                            LogicHandler.DoCommandLog(User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "采集良品", "采集良品成功", LastSncode, ob_checkno.Text);
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "采集良品", "采集良品成功", LastSncode, ob_checkno.Text);
                         }
                         else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
                     }
@@ -349,7 +349,7 @@ namespace UAS_MES.Make
                             LastSncode = ms_sncode.Text;
                             OperateResult.AppendText(">>" + ms_sncode.Text + "成功采集为良品\n", Color.Green, ms_sncode);
                             //记录操作日志
-                            LogicHandler.DoCommandLog(User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "采集良品", "采集良品成功", LastSncode, ob_checkno.Text);
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "采集良品", "采集良品成功", LastSncode, ob_checkno.Text);
                         }
                         else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
                     }
@@ -450,7 +450,7 @@ namespace UAS_MES.Make
                         dh.UpdateByCondition("steppassed", "sp_result='不良品',sp_ifng=-1,sp_ymd=to_char(sysdate,'yyyymmdd'),sp_hm=to_char(sysdate,'hh24miss')", "sp_id=(select max(sp_id) from steppassed where sp_sncode='"+ms_sncode.Text+"')");
                         dh.UpdateByCondition("makecraftdetail", "mcd_okqty=mcd_okqty-1", "mcd_macode='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
                         dh.UpdateByCondition("makeserial", "ms_nextstepcode=''", "ms_sncode='" + ms_sncode.Text + "'");
-                        LogicHandler.DoCommandLog(User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "采集不良", "采集不良成功", ms_sncode.Text, ob_checkno.Text);
+                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "采集不良", "采集不良成功", ms_sncode.Text, ob_checkno.Text);
                     }
                     string checkno = dt.Rows[0]["ms_checkno"].ToString();
                     //存在抽检批次更新为空
@@ -586,7 +586,7 @@ namespace UAS_MES.Make
             ms_sncode.Focus();
             LogicHandler.InsertMakeProcess(LastSncode, ma_code.Text, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
             //记录操作日志
-            LogicHandler.DoCommandLog(User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "手动送检", "手动送检成功", "", ob_checkno.Text);
+            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "手动送检", "手动送检成功", "", ob_checkno.Text);
             ob_checkno.Text = "";
         }
 

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.cs

@@ -168,7 +168,7 @@ namespace UAS_MES.OQC
                     sql.Append(":oi_sampleqty,ci_code from QUA_PROJECT left join QUA_PROJECTDETAIL on pd_prid=pr_id ");
                     sql.Append("LEFT JOIN QUA_CHECKITEM ON PD_CIID=CI_ID  where pr_code='" + pr_code.Text + "' and ci_kind=:ci_kind1");
                     dh.BatchInsert(sql.GetString(), new string[] { "ci_kind", "oi_sampleqty", "ci_kind1" }, ci_kind.ToArray(), oi_sampleqty.ToArray(), ci_kind.ToArray());
-                    LogicHandler.DoCommandLog(User.UserCode, "", User.UserLineCode, User.UserSourceCode, "OQC抽样计划采集保存抽样计划", "成功", ms_sncode.Text, ob_checkno.Text);
+                    LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode, "", User.UserLineCode, User.UserSourceCode, "OQC抽样计划采集保存抽样计划", "成功", ms_sncode.Text, ob_checkno.Text);
                 }
                 OperateResult.AppendText(">>保存成功\n", Color.Green);
             }

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -325,7 +325,7 @@ namespace UAS_MES.OQC
                         string checkqty = dh.getFieldDataByCondition("OQCItems", "max(oi_checkqty)", "oi_checkno ='" + ob_checkno.Text + "'").ToString();
                         dh.ExecuteSql("update OQCBATCH set ob_ngqty='" + ngqty + "',ob_actsampleqty='" + checkqty + "',ob_okqty=('" + checkqty + "'-'" + ngqty + "') where ob_checkno ='" + ob_checkno.Text + "'", "update");
                         OperateResult.AppendText(">>序列号 " + sncode.Text + "操作成功\n", Color.Green);
-                        LogicHandler.DoCommandLog(User.UserCode, "", User.UserLineCode, User.UserSourceCode, "抽样数据采集", "检验项目采集成功", sncode.Text, ob_checkno.Text);
+                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, "", User.UserLineCode, User.UserSourceCode, "抽样数据采集", "检验项目采集成功", sncode.Text, ob_checkno.Text);
                         GetBatch.PerformClick();
                         ChoosedDGV.DataSource = null;
                         BaseUtil.CleanDGVData(CheckTypeDGV);

UAS-MES/PublicMethod/LogicHandler.cs

@@ -462,13 +462,13 @@ namespace UAS_MES.PublicMethod
                 return false;
         }
 
-        public static void DoCommandLog(string iUserCode, string iMakeCode, string iLineCode, string iSourceCode, string iOperate, string iResult, string iSncode, string iCheckno)
+        public static void DoCommandLog(string iCaller,string iUserCode, string iMakeCode, string iLineCode, string iSourceCode, string iOperate, string iResult, string iSncode, string iCheckno)
         {
             sql.Clear();
-            sql.Append("insert into commandlog(cl_id,cl_man,cl_date,cl_linecode,cl_sourcecode,cl_makecode,cl_operate,");
+            sql.Append("insert into commandlog(cl_id,:cl_caller,cl_man,cl_date,cl_linecode,cl_sourcecode,cl_makecode,cl_operate,");
             sql.Append("cl_result,cl_sncode,cl_code) select commandlog_seq.nextval,:iUserCode,sysdate,:iLineCode ,");
             sql.Append(":iSourceCode ,ms_makecode,:iOperate,:iResult,:iSncode,ms_checkno from makeserial where ms_sncode=:iSncode");
-            dh.ExecuteSql(sql.ToString(), "insert", iUserCode, iLineCode, iSourceCode, iOperate, iResult, iSncode, iSncode);
+            dh.ExecuteSql(sql.ToString(), "insert", iCaller, iUserCode, iLineCode, iSourceCode, iOperate, iResult, iSncode, iSncode);
         }
 
         /// <summary>