|
|
@@ -4433,6 +4433,200 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
|
|
|
#endregion
|
|
|
|
|
|
+ //#region SQL
|
|
|
+ //string sql = "insert into tp_pm_productiondataIn"
|
|
|
+ // + " (productiondataid,"
|
|
|
+ // + " barcode,"
|
|
|
+ // + " centralizedbatchno,"
|
|
|
+ // + " productionlineid,"
|
|
|
+ // + " productionlinecode,"
|
|
|
+ // + " productionlinename,"
|
|
|
+ // + " procedureid,"
|
|
|
+ // + " procedurecode,"
|
|
|
+ // + " procedurename,"
|
|
|
+ // + " proceduremodel,"
|
|
|
+ // + " modeltype,"
|
|
|
+ // + " piecetype,"
|
|
|
+ // + " isreworked,"
|
|
|
+ // + " nodetype,"
|
|
|
+ // + " ispublicbody,"
|
|
|
+ // + " isrefire,"
|
|
|
+ // + " organizationid,"
|
|
|
+ // + " goodsid,"
|
|
|
+ // + " goodscode,"
|
|
|
+ // + " goodsname,"
|
|
|
+ // + " userid,"
|
|
|
+ // + " usercode,"
|
|
|
+ // + " username,"
|
|
|
+ // + " kilnid,"
|
|
|
+ // + " kilncode,"
|
|
|
+ // + " kilnname,"
|
|
|
+ // + " kilncarid,"
|
|
|
+ // + " kilncarcode,"
|
|
|
+ // + " kilncarname,"
|
|
|
+ // + " kilncarbatchno,"
|
|
|
+ // + " kilncarposition,"
|
|
|
+ // + " reworkprocedureid,"
|
|
|
+ // + " reworkprocedurecode,"
|
|
|
+ // + " reworkprocedurename,"
|
|
|
+ // + " remarks,"
|
|
|
+ // + " accountdate,"
|
|
|
+ // + " accountid,"
|
|
|
+ // + " GoodsLevelID,"
|
|
|
+ // + " GoodsLevelTypeID,"
|
|
|
+ // + " createuserid,"
|
|
|
+ // + " updateuserid,"
|
|
|
+ // + " GroutingDate,"
|
|
|
+ // + " GroutingUserID,"
|
|
|
+ // + " GroutingUserCode,"
|
|
|
+ // + " GroutingNum,"
|
|
|
+ // + " GroutingMouldCode,"
|
|
|
+ // + " MouldCode,"
|
|
|
+ // + "GroutingDailyID,"
|
|
|
+ // + "GroutingDailyDetailID,"
|
|
|
+ // + "GroutingLineID,"
|
|
|
+ // + " GroutingLineCode,"
|
|
|
+ // + "GroutingLineName,"
|
|
|
+ // + "GMouldTypeID,"
|
|
|
+ // + "CanManyTimes,"
|
|
|
+ // + "GroutingLineDetailID,"
|
|
|
+ // + "SpecialRepairflag,"
|
|
|
+ // + "ClassesSettingID,"
|
|
|
+ // + "LogoID"
|
|
|
+ // + ")"
|
|
|
+ // + " values"
|
|
|
+ // + " (:productiondataid,"
|
|
|
+ // + " :barcode,"
|
|
|
+ // + " :centralizedbatchno,"
|
|
|
+ // + " :productionlineid,"
|
|
|
+ // + " :productionlinecode,"
|
|
|
+ // + " :productionlinename,"
|
|
|
+ // + " :procedureid,"
|
|
|
+ // + " :procedurecode,"
|
|
|
+ // + " :procedurename,"
|
|
|
+ // + " :proceduremodel,"
|
|
|
+ // + " :modeltype,"
|
|
|
+ // + " :piecetype,"
|
|
|
+ // + " :isreworked,"
|
|
|
+ // + " :nodetype,"
|
|
|
+ // + " :ispublicbody,"
|
|
|
+ // + " :isrefire,"
|
|
|
+ // + " :organizationid,"
|
|
|
+ // + " :goodsid,"
|
|
|
+ // + " :goodscode,"
|
|
|
+ // + " :goodsname,"
|
|
|
+ // + " :userid,"
|
|
|
+ // + " :usercode,"
|
|
|
+ // + " :username,"
|
|
|
+ // + " :kilnid,"
|
|
|
+ // + " :kilncode,"
|
|
|
+ // + " :kilnname,"
|
|
|
+ // + " :kilncarid,"
|
|
|
+ // + " :kilncarcode,"
|
|
|
+ // + " :kilncarname,"
|
|
|
+ // + " :kilncarbatchno,"
|
|
|
+ // + " :kilncarposition,"
|
|
|
+ // + " :reworkprocedureid,"
|
|
|
+ // + " :reworkprocedurecode,"
|
|
|
+ // + " :reworkprocedurename,"
|
|
|
+ // + " :remarks,"
|
|
|
+ // + " :accountdata,"
|
|
|
+ // + " :accountid,"
|
|
|
+ // + " :GoodsLevelID,"
|
|
|
+ // + " :GoodsLevelTypeID,"
|
|
|
+ // + " :createuserid,"
|
|
|
+ // + " :updateuserid,"
|
|
|
+ // + " :groutingdate,"
|
|
|
+ // + " :groutinguserid,"
|
|
|
+ // + " :groutingusercode,"
|
|
|
+ // + " :groutingnum,"
|
|
|
+ // + " :groutingmouldcode,"
|
|
|
+ // + " :mouldcode,"
|
|
|
+ // + ":groutingdailyid,"
|
|
|
+ // + ":groutingdailydetailid,"
|
|
|
+ // + ":groutinglineid,"
|
|
|
+ // + " :groutinglinecode,"
|
|
|
+ // + ":groutinglinename,"
|
|
|
+ // + ":gmouldtypeid,"
|
|
|
+ // + ":canmanytimes,"
|
|
|
+ // + ":groutinglinedetailid,"
|
|
|
+ // + ":specialRepairflag,"
|
|
|
+ // + ":classesSettingID,"
|
|
|
+ // + ":logoID"
|
|
|
+ // + ")";
|
|
|
+ //#endregion
|
|
|
+ //#region OracleParameter
|
|
|
+ //OracleParameter[] paras = new OracleParameter[] {
|
|
|
+ // new OracleParameter(":classesSettingID",productionData.ClassesSettingID),
|
|
|
+ // new OracleParameter(":productiondataid",productionData.ProductionDataID),
|
|
|
+ // new OracleParameter(":barcode",productionData.Barcode),
|
|
|
+ // new OracleParameter(":centralizedbatchno",productionData.CentralizedBatchNo),
|
|
|
+ // new OracleParameter(":productionlineid",productionData.ProductionLineID),
|
|
|
+ // new OracleParameter(":productionlinecode",productionData.ProductionLineCode),
|
|
|
+ // new OracleParameter(":productionlinename",productionData.ProductionLineName),
|
|
|
+ // new OracleParameter(":procedureid",productionData.CompleteProcedureID),
|
|
|
+ // new OracleParameter(":procedurecode",productionData.ProcedureCode),
|
|
|
+ // new OracleParameter(":procedurename",productionData.ProcedureName),
|
|
|
+ // new OracleParameter(":proceduremodel",productionData.ProcedureModel),
|
|
|
+ // new OracleParameter(":modeltype",productionData.ModelType),
|
|
|
+ // new OracleParameter(":piecetype",productionData.PieceType),
|
|
|
+ // new OracleParameter(":isreworked",productionData.IsReworked),
|
|
|
+ // new OracleParameter(":nodetype",productionData.NodeType),
|
|
|
+ // new OracleParameter(":ispublicbody",productionData.IsPublicBody),
|
|
|
+ // new OracleParameter(":isrefire",productionData.IsReFire),
|
|
|
+ // new OracleParameter(":organizationid",productionData.OrganizationID),
|
|
|
+ // new OracleParameter(":goodsid",productionData.GoodsID),
|
|
|
+ // new OracleParameter(":goodscode",productionData.GoodsCode),
|
|
|
+ // new OracleParameter(":goodsname",productionData.GoodsName),
|
|
|
+ // new OracleParameter(":userid",productionData.UserID),
|
|
|
+ // new OracleParameter(":usercode",productionData.UserCode),
|
|
|
+ // new OracleParameter(":username",productionData.UserName),
|
|
|
+ // new OracleParameter(":kilnid",productionData.KilnID),
|
|
|
+ // new OracleParameter(":kilncode",productionData.KilnCode),
|
|
|
+ // new OracleParameter(":kilnname",productionData.KilnName),
|
|
|
+ // new OracleParameter(":kilncarid",productionData.KilnCarID),
|
|
|
+ // new OracleParameter(":kilncarcode",productionData.KilnCarCode),
|
|
|
+ // new OracleParameter(":kilncarname",productionData.KilnCarName),
|
|
|
+ // new OracleParameter(":kilncarbatchno",productionData.KilnCarBatchNo),
|
|
|
+ // new OracleParameter(":kilncarposition",productionData.KilnCarPosition),
|
|
|
+ // new OracleParameter(":reworkprocedureid",productionData.ReworkProcedureID),
|
|
|
+ // new OracleParameter(":reworkprocedurecode",productionData.ReworkProcedureCode),
|
|
|
+ // new OracleParameter(":reworkprocedurename",productionData.ReworkProcedureName),
|
|
|
+ // new OracleParameter(":remarks",productionData.Remarks),
|
|
|
+ // new OracleParameter(":accountdata",accountDate),
|
|
|
+ // new OracleParameter(":accountid",sUserInfo.AccountID),
|
|
|
+ // new OracleParameter(":GoodsLevelID",productionData.GoodsLevelID),
|
|
|
+ // new OracleParameter(":GoodsLevelTypeID",productionData.GoodsLevelTypeID),
|
|
|
+ // new OracleParameter(":createuserid",sUserInfo.UserID),
|
|
|
+ // new OracleParameter(":updateuserid",sUserInfo.UserID),
|
|
|
+ // new OracleParameter(":groutingdate",GroutingDate),
|
|
|
+ // new OracleParameter(":groutinguserid",GroutingUserID),
|
|
|
+ // new OracleParameter(":groutingusercode",GroutingUserCode),
|
|
|
+ // new OracleParameter(":groutingnum",GroutingNum),
|
|
|
+ // new OracleParameter(":groutingmouldcode",GroutingMouldCode),
|
|
|
+ // new OracleParameter(":mouldcode",MouldCode),
|
|
|
+ // new OracleParameter(":groutingdailyid",GroutingDailyID),
|
|
|
+ // new OracleParameter(":groutingdailydetailid",GroutingDailyDetailID),
|
|
|
+ // new OracleParameter(":groutinglineid",GroutingLineID),
|
|
|
+ // new OracleParameter(":groutinglinecode",GroutingLineCode),
|
|
|
+ // new OracleParameter(":groutinglinename",GroutingLineName),
|
|
|
+ // new OracleParameter(":gmouldtypeid",GMouldTypeID),
|
|
|
+ // new OracleParameter(":canmanytimes",CanManyTimes),
|
|
|
+ // new OracleParameter(":groutinglinedetailid",GroutingLineDetailID),
|
|
|
+ // new OracleParameter(":specialRepairflag",SpecialRepairflag),
|
|
|
+ // new OracleParameter(":logoID",logoID),
|
|
|
+ //};
|
|
|
+ //#endregion
|
|
|
+ DateTime? checkTime = null;
|
|
|
+ if (productionData.CheckTime != null)
|
|
|
+ {
|
|
|
+ // PDA端
|
|
|
+ if (productionData.CheckTime.ToString() != string.Empty)
|
|
|
+ {
|
|
|
+ checkTime = Convert.ToDateTime(productionData.CheckTime);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
#region SQL
|
|
|
string sql = "insert into tp_pm_productiondataIn"
|
|
|
+ " (productiondataid,"
|
|
|
@@ -4492,7 +4686,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
+ "GroutingLineDetailID,"
|
|
|
+ "SpecialRepairflag,"
|
|
|
+ "ClassesSettingID,"
|
|
|
- + "LogoID"
|
|
|
+ + "LogoID,"
|
|
|
+ + "CheckTime"
|
|
|
+ ")"
|
|
|
+ " values"
|
|
|
+ " (:productiondataid,"
|
|
|
@@ -4552,11 +4747,23 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
+ ":groutinglinedetailid,"
|
|
|
+ ":specialRepairflag,"
|
|
|
+ ":classesSettingID,"
|
|
|
- + ":logoID"
|
|
|
- + ")";
|
|
|
+ + ":logoid,";
|
|
|
+ if (checkTime == null)
|
|
|
+ {
|
|
|
+ sql = sql + "sysdate";
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ sql = sql + ":checkTime";
|
|
|
+ }
|
|
|
+
|
|
|
+ sql = sql + ")";
|
|
|
#endregion
|
|
|
#region OracleParameter
|
|
|
- OracleParameter[] paras = new OracleParameter[] {
|
|
|
+ OracleParameter[] paras = null;
|
|
|
+ if (checkTime != null)
|
|
|
+ {
|
|
|
+ paras = new OracleParameter[] {
|
|
|
new OracleParameter(":classesSettingID",productionData.ClassesSettingID),
|
|
|
new OracleParameter(":productiondataid",productionData.ProductionDataID),
|
|
|
new OracleParameter(":barcode",productionData.Barcode),
|
|
|
@@ -4614,9 +4821,76 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
new OracleParameter(":canmanytimes",CanManyTimes),
|
|
|
new OracleParameter(":groutinglinedetailid",GroutingLineDetailID),
|
|
|
new OracleParameter(":specialRepairflag",SpecialRepairflag),
|
|
|
- new OracleParameter(":logoID",logoID),
|
|
|
+ new OracleParameter(":logoid",logoID),
|
|
|
+ new OracleParameter(":checkTime",checkTime),
|
|
|
+ };
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ paras = new OracleParameter[] {
|
|
|
+ new OracleParameter(":classesSettingID",productionData.ClassesSettingID),
|
|
|
+ new OracleParameter(":productiondataid",productionData.ProductionDataID),
|
|
|
+ new OracleParameter(":barcode",productionData.Barcode),
|
|
|
+ new OracleParameter(":centralizedbatchno",productionData.CentralizedBatchNo),
|
|
|
+ new OracleParameter(":productionlineid",productionData.ProductionLineID),
|
|
|
+ new OracleParameter(":productionlinecode",productionData.ProductionLineCode),
|
|
|
+ new OracleParameter(":productionlinename",productionData.ProductionLineName),
|
|
|
+ new OracleParameter(":procedureid",productionData.CompleteProcedureID),
|
|
|
+ new OracleParameter(":procedurecode",productionData.ProcedureCode),
|
|
|
+ new OracleParameter(":procedurename",productionData.ProcedureName),
|
|
|
+ new OracleParameter(":proceduremodel",productionData.ProcedureModel),
|
|
|
+ new OracleParameter(":modeltype",productionData.ModelType),
|
|
|
+ new OracleParameter(":piecetype",productionData.PieceType),
|
|
|
+ new OracleParameter(":isreworked",productionData.IsReworked),
|
|
|
+ new OracleParameter(":nodetype",productionData.NodeType),
|
|
|
+ new OracleParameter(":ispublicbody",productionData.IsPublicBody),
|
|
|
+ new OracleParameter(":isrefire",productionData.IsReFire),
|
|
|
+ new OracleParameter(":organizationid",productionData.OrganizationID),
|
|
|
+ new OracleParameter(":goodsid",productionData.GoodsID),
|
|
|
+ new OracleParameter(":goodscode",productionData.GoodsCode),
|
|
|
+ new OracleParameter(":goodsname",productionData.GoodsName),
|
|
|
+ new OracleParameter(":userid",productionData.UserID),
|
|
|
+ new OracleParameter(":usercode",productionData.UserCode),
|
|
|
+ new OracleParameter(":username",productionData.UserName),
|
|
|
+ new OracleParameter(":kilnid",productionData.KilnID),
|
|
|
+ new OracleParameter(":kilncode",productionData.KilnCode),
|
|
|
+ new OracleParameter(":kilnname",productionData.KilnName),
|
|
|
+ new OracleParameter(":kilncarid",productionData.KilnCarID),
|
|
|
+ new OracleParameter(":kilncarcode",productionData.KilnCarCode),
|
|
|
+ new OracleParameter(":kilncarname",productionData.KilnCarName),
|
|
|
+ new OracleParameter(":kilncarbatchno",productionData.KilnCarBatchNo),
|
|
|
+ new OracleParameter(":kilncarposition",productionData.KilnCarPosition),
|
|
|
+ new OracleParameter(":reworkprocedureid",productionData.ReworkProcedureID),
|
|
|
+ new OracleParameter(":reworkprocedurecode",productionData.ReworkProcedureCode),
|
|
|
+ new OracleParameter(":reworkprocedurename",productionData.ReworkProcedureName),
|
|
|
+ new OracleParameter(":remarks",productionData.Remarks),
|
|
|
+ new OracleParameter(":accountdata",accountDate),
|
|
|
+ new OracleParameter(":accountid",sUserInfo.AccountID),
|
|
|
+ new OracleParameter(":GoodsLevelID",productionData.GoodsLevelID),
|
|
|
+ new OracleParameter(":GoodsLevelTypeID",productionData.GoodsLevelTypeID),
|
|
|
+ new OracleParameter(":createuserid",sUserInfo.UserID),
|
|
|
+ new OracleParameter(":updateuserid",sUserInfo.UserID),
|
|
|
+ new OracleParameter(":groutingdate",GroutingDate),
|
|
|
+ new OracleParameter(":groutinguserid",GroutingUserID),
|
|
|
+ new OracleParameter(":groutingusercode",GroutingUserCode),
|
|
|
+ new OracleParameter(":groutingnum",GroutingNum),
|
|
|
+ new OracleParameter(":groutingmouldcode",GroutingMouldCode),
|
|
|
+ new OracleParameter(":mouldcode",MouldCode),
|
|
|
+ new OracleParameter(":groutingdailyid",GroutingDailyID),
|
|
|
+ new OracleParameter(":groutingdailydetailid",GroutingDailyDetailID),
|
|
|
+ new OracleParameter(":groutinglineid",GroutingLineID),
|
|
|
+ new OracleParameter(":groutinglinecode",GroutingLineCode),
|
|
|
+ new OracleParameter(":groutinglinename",GroutingLineName),
|
|
|
+ new OracleParameter(":gmouldtypeid",GMouldTypeID),
|
|
|
+ new OracleParameter(":canmanytimes",CanManyTimes),
|
|
|
+ new OracleParameter(":groutinglinedetailid",GroutingLineDetailID),
|
|
|
+ new OracleParameter(":specialRepairflag",SpecialRepairflag),
|
|
|
+ new OracleParameter(":logoid",logoID),
|
|
|
};
|
|
|
+ }
|
|
|
+
|
|
|
#endregion
|
|
|
+
|
|
|
foreach (OracleParameter para in paras)
|
|
|
{
|
|
|
if (string.IsNullOrEmpty(para.Value + ""))
|
|
|
@@ -13710,6 +13984,11 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
productionData.UserID = workUserID;
|
|
|
productionData.UserCode = barcodeRow["UserCode"].ToString();
|
|
|
productionData.UserName = barcodeRow["UserName"].ToString();
|
|
|
+ // 250930 复检的 所有的 包装入仓 的checktime 和 首检的一致
|
|
|
+ if (procedure.ProcedureID == 15 && !string.IsNullOrEmpty(barcodeRow["PDACheckTime"].ToString()) )
|
|
|
+ {
|
|
|
+ productionData.CheckTime = Convert.ToDateTime(barcodeRow["PDACheckTime"].ToString());
|
|
|
+ }
|
|
|
#endregion
|
|
|
string OutSpecialRepairflag = "0";//干补标识
|
|
|
DataSet outDataSet = null;
|
|
|
@@ -22528,7 +22807,8 @@ updateuserid=:updateuserid where barcode=:barcode";
|
|
|
//productionData.ProductionLineName = procedure.ProductionlineName;
|
|
|
productionData.CompleteProcedureID = productionData.ProcedureID;
|
|
|
//productionData.ProcedureCode = procedure.ProcedureCode;
|
|
|
- //productionData.ProcedureName = procedure.ProcedureName;
|
|
|
+ // // 20250929 将质量登记或重烧质量登记改为复检
|
|
|
+ productionData.ProcedureName = "复检";
|
|
|
//productionData.ProcedureModel = procedure.ProcedureModel;
|
|
|
//productionData.ModelType = procedure.ModelType;
|
|
|
productionData.NodeType = 2;// procedure.NodeType;
|
