模具干燥

DK.Basics/BaseResources/Constant.cs

@@ -1194,6 +1194,10 @@ namespace Dongke.IBOSS.PRD.Basics.BaseResources
             /// 4 报废
             /// </summary>
             Scrap = 4,
+            /// <summary>
+            /// 5 制模
+            /// </summary>
+            Make = 5,
         }
 
 
@@ -1255,6 +1259,10 @@ namespace Dongke.IBOSS.PRD.Basics.BaseResources
             /// </summary>
             UnMouldPlan = 13,
             /// <summary>
+            /// 14 模具新增（模具制模）
+            /// </summary>
+            MakeMould = 14,
+            /// <summary>
             /// -1 变更型号
             /// </summary>
             ChangeGoodsCode = -1,

DK.Service/PCModuleService/PCModuleLogic.cs

@@ -2430,42 +2430,200 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleService
                         {
                             sre.Result = mouldBarcode;
                         }
-                        //cre.Properties["MouldBarcode"] = mouldBarcode;
+						//cre.Properties["MouldBarcode"] = mouldBarcode;
+
+                        //251201 增加逻辑 高压新增为在库，石膏模新增为制模
+						if (cre.Properties["MouldType"].ToString() == "83")
+						{
+                            //石膏模
+                            sql =
+                            "INSERT INTO tp_pc_mouldchangehistory\n" +
+                            "  (CHANGEID\n" +
+                            "  ,MOULDID\n" +
+                            "  ,MOULDCODE\n" +
+                            "  ,MOULDBARCODE\n" +
+                            "  ,GOODSID\n" +
+                            "  ,GOODSCODE\n" +
+                            "  ,OPERATIONTYPE\n" +
+                            "  ,MOULDSTATUS\n" +
+                            "  ,MOULDSTATUSAFTER\n" +
+                            "  ,GROUTINGNUM\n" +
+                            "  ,REMARKS\n" +
+                            "  ,CHANGEFLAG\n" +
+                            "  ,ACCOUNTID\n" +
+                            "  ,CREATEUSERID)\n" +
+                            "  Values( :changeID\n" +
+                            "        ,:MOULDID\n" +
+                            "        ,:MOULDCODE\n" +
+                            "        ,:MOULDBARCODE\n" +
+                            "        ,:GOODSID\n" +
+                            "        ,:GOODSCODE\n" +
+                            "        ,:OPERATIONTYPE\n" +
+                            "        ,0\n" +
+                            "        ,5\n" +
+                            "        ,0\n" +
+                            "        ,:REMARKS\n" +
+                            "        ,'0'\n" +
+                            "        ,:ACCOUNTID\n" +
+                            "        ,:CREATEUSERID\n" +
+                            " )";
 
-                        sql =
-                        "INSERT INTO tp_pc_mouldchangehistory\n" +
-                        "  (CHANGEID\n" +
-                        "  ,MOULDID\n" +
-                        "  ,MOULDCODE\n" +
-                        "  ,MOULDBARCODE\n" +
-                        "  ,GOODSID\n" +
-                        "  ,GOODSCODE\n" +
-                        "  ,OPERATIONTYPE\n" +
-                        "  ,MOULDSTATUS\n" +
-                        "  ,MOULDSTATUSAFTER\n" +
-                        "  ,GROUTINGNUM\n" +
-                        "  ,REMARKS\n" +
-                        "  ,CHANGEFLAG\n" +
-                        "  ,ACCOUNTID\n" +
-                        "  ,CREATEUSERID)\n" +
-                        "  Values( :changeID\n" +
-                        "        ,:MOULDID\n" +
-                        "        ,:MOULDCODE\n" +
-                        "        ,:MOULDBARCODE\n" +
-                        "        ,:GOODSID\n" +
-                        "        ,:GOODSCODE\n" +
-                        "        ,:OPERATIONTYPE\n" +
-                        "        ,0\n" +
-                        "        ,1\n" +
-                        "        ,0\n" +
-                        "        ,:REMARKS\n" +
-                        "        ,'1'\n" +
-                        "        ,:ACCOUNTID\n" +
-                        "        ,:CREATEUSERID\n" +
-                        " )";
+                            paras = new OracleParameter[]
+                            {
+                            new OracleParameter(":changeID", OracleDbType.Int32,
+                                mouldHistoryID, ParameterDirection.Input),
+                            new OracleParameter(":MOULDID", OracleDbType.Int32,
+                                mouldID, ParameterDirection.Input),
+                            new OracleParameter(":MOULDCODE", OracleDbType.Varchar2,
+                                mouldcode, ParameterDirection.Input),
+                            new OracleParameter(":MOULDBARCODE", OracleDbType.Varchar2,
+                                mouldBarcode, ParameterDirection.Input),
+                            new OracleParameter(":GOODSID", OracleDbType.Int32,
+                                cre.Properties["GoodsID"], ParameterDirection.Input),
+                            new OracleParameter(":GOODSCODE", OracleDbType.NVarchar2,
+                                cre.Properties["GoodsCode"], ParameterDirection.Input),
+                            new OracleParameter(":OPERATIONTYPE", OracleDbType.Int32,
+                                (int)Constant.MouldOperationType.MakeMould, ParameterDirection.Input),
+                            new OracleParameter(":REMARKS", OracleDbType.NVarchar2,
+                                cre.Properties["Remarks"], ParameterDirection.Input),
+                            new OracleParameter(":ACCOUNTID", OracleDbType.Int32,
+                                sUserInfo.AccountID, ParameterDirection.Input),
+                            new OracleParameter(":CREATEUSERID", OracleDbType.Int32,
+                                sUserInfo.UserID, ParameterDirection.Input),
+                            };
+                            retrunRow += con.ExecuteNonQuery(sql, paras);
 
-                        paras = new OracleParameter[]
+                            sql =
+                            "INSERT INTO tp_pc_mould\n" +
+                            "  (MOULDID\n" +
+                            "  ,MOULDCODE\n" +
+                            "  ,MOULDBARCODE\n" +
+                            "  ,MOULDTYPE\n" +
+                            "  ,MATERIALSUPPLIER\n" +
+                            "  ,PRODUCTIONDATE\n" +
+                            "  ,GOODSID\n" +
+                            "  ,GOODSCODE\n" +
+                            "  ,USERID\n" +
+                            "  ,USERCODE\n" +
+                            "  ,WEIGHT\n" +
+                            "  ,COST\n" +
+                            "  ,STANDARDGROUTINGNUM\n" +
+                            "  ,OUTPUTCOUNT\n" +
+                            "  ,MOULDSTATUS\n" +
+                            "  ,PREMOULDSTATUS\n" +
+                            "  ,LASTCHANGEHISTORYID\n" +
+                            "  ,REMARKS\n" +
+                            "  ,MOULD_PLAN_ID\n" + //add 夏常明 模具生产计划id 2023-6-26
+                            "  ,ACCOUNTID\n" +
+                            "  ,CREATEUSERID\n" +
+                            "  ,UPDATEUSERID)\n" +
+                            "VALUES\n" +
+                            "  (:MOULDID\n" +
+                            "  ,:MOULDCODE\n" +
+                            "  ,:MOULDBARCODE\n" +
+                            "  ,:MOULDTYPE\n" +
+                            "  ,:MATERIALSUPPLIER\n" +
+                            "  ,:PRODUCTIONDATE\n" +
+                            "  ,:GOODSID\n" +
+                            "  ,:GOODSCODE\n" +
+                            "  ,:USERID\n" +
+                            "  ,:USERCODE\n" +
+                            "  ,:WEIGHT\n" +
+                            "  ,:COST\n" +
+                            "  ,:STANDARDGROUTINGNUM\n" +
+                            "  ,:OUTPUTCOUNT\n" +
+                            "  ,:MOULDSTATUS\n" +
+                            "  ,:PREMOULDSTATUS\n" +
+                            "  ,:LASTCHANGEHISTORYID\n" +
+                            "  ,:REMARKS\n" +
+                            "  ,:MOULD_PLAN_ID\n" + //add 夏常明 模具生产计划id 2023-6-26
+                            "  ,:ACCOUNTID\n" +
+                            "  ,:CREATEUSERID\n" +
+                            "  ,:CREATEUSERID)";
+                            paras = new OracleParameter[]
+                            {
+                            new OracleParameter(":MOULDCODE", OracleDbType.Varchar2,
+                                mouldcode, ParameterDirection.Input),
+                            new OracleParameter(":MOULDSTATUS", OracleDbType.Int32,
+                                (int)Constant.MouldStatus.Make, ParameterDirection.Input),
+                            new OracleParameter(":PREMOULDSTATUS", OracleDbType.Int32,
+                                (int)Constant.MouldStatus.Add, ParameterDirection.Input),
+                            new OracleParameter(":LASTCHANGEHISTORYID", OracleDbType.Int32,
+                                mouldHistoryID, ParameterDirection.Input),
+                            new OracleParameter(":MOULDID", OracleDbType.Int32,
+                                mouldID, ParameterDirection.Input),
+                            new OracleParameter(":MOULDBARCODE", OracleDbType.Varchar2,
+                                mouldBarcode, ParameterDirection.Input),
+                            new OracleParameter(":MOULDTYPE", OracleDbType.Int32,
+                                cre.Properties["MouldType"], ParameterDirection.Input),
+                            new OracleParameter(":MATERIALSUPPLIER", OracleDbType.Int32,
+                                cre.Properties["MaterialSupplier"], ParameterDirection.Input),
+                            new OracleParameter(":PRODUCTIONDATE", OracleDbType.Date,
+                                cre.Properties["ProductionDate"], ParameterDirection.Input),
+                            new OracleParameter(":GOODSID", OracleDbType.Int32,
+                                cre.Properties["GoodsID"], ParameterDirection.Input),
+                            new OracleParameter(":GOODSCODE", OracleDbType.NVarchar2,
+                                cre.Properties["GoodsCode"], ParameterDirection.Input),
+                            new OracleParameter(":USERID", OracleDbType.Int32,
+                                cre.Properties["UserID"], ParameterDirection.Input),
+                            new OracleParameter(":USERCODE", OracleDbType.NVarchar2,
+                                cre.Properties["UserCode"], ParameterDirection.Input),
+                            new OracleParameter(":WEIGHT", OracleDbType.Decimal,
+                                cre.Properties["Weight"], ParameterDirection.Input),
+                            new OracleParameter(":COST", OracleDbType.Decimal,
+                                cre.Properties["Cost"], ParameterDirection.Input),
+                            new OracleParameter(":STANDARDGROUTINGNUM", OracleDbType.Decimal,
+                                cre.Properties["StandardGroutingNum"], ParameterDirection.Input),
+                            new OracleParameter(":OUTPUTCOUNT", OracleDbType.Decimal,
+                                cre.Properties["OutputCount"], ParameterDirection.Input),
+                            new OracleParameter(":REMARKS", OracleDbType.NVarchar2,
+                                cre.Properties["Remarks"], ParameterDirection.Input),
+                            new OracleParameter(":MOULD_PLAN_ID", OracleDbType.Int32,
+                                cre.Properties["MOULD_PLAN_ID"], ParameterDirection.Input),// 模具生产计划id
+                            new OracleParameter(":ACCOUNTID", OracleDbType.Int32,
+                                sUserInfo.AccountID, ParameterDirection.Input),
+                            new OracleParameter(":CREATEUSERID", OracleDbType.Int32,
+                                sUserInfo.UserID, ParameterDirection.Input),
+                            };
+                            retrunRow += con.ExecuteNonQuery(sql, paras);
+                        }
+						else if (cre.Properties["MouldType"].ToString() == "86")
                         {
+                            //高压
+                            sql =
+                            "INSERT INTO tp_pc_mouldchangehistory\n" +
+                            "  (CHANGEID\n" +
+                            "  ,MOULDID\n" +
+                            "  ,MOULDCODE\n" +
+                            "  ,MOULDBARCODE\n" +
+                            "  ,GOODSID\n" +
+                            "  ,GOODSCODE\n" +
+                            "  ,OPERATIONTYPE\n" +
+                            "  ,MOULDSTATUS\n" +
+                            "  ,MOULDSTATUSAFTER\n" +
+                            "  ,GROUTINGNUM\n" +
+                            "  ,REMARKS\n" +
+                            "  ,CHANGEFLAG\n" +
+                            "  ,ACCOUNTID\n" +
+                            "  ,CREATEUSERID)\n" +
+                            "  Values( :changeID\n" +
+                            "        ,:MOULDID\n" +
+                            "        ,:MOULDCODE\n" +
+                            "        ,:MOULDBARCODE\n" +
+                            "        ,:GOODSID\n" +
+                            "        ,:GOODSCODE\n" +
+                            "        ,:OPERATIONTYPE\n" +
+                            "        ,0\n" +
+                            "        ,1\n" +
+                            "        ,0\n" +
+                            "        ,:REMARKS\n" +
+                            "        ,'1'\n" +
+                            "        ,:ACCOUNTID\n" +
+                            "        ,:CREATEUSERID\n" +
+                            " )";
+
+                            paras = new OracleParameter[]
+                            {
                             new OracleParameter(":changeID", OracleDbType.Int32,
                                 mouldHistoryID, ParameterDirection.Input),
                             new OracleParameter(":MOULDID", OracleDbType.Int32,
@@ -2486,58 +2644,58 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleService
                                 sUserInfo.AccountID, ParameterDirection.Input),
                             new OracleParameter(":CREATEUSERID", OracleDbType.Int32,
                                 sUserInfo.UserID, ParameterDirection.Input),
-                        };
-                        retrunRow += con.ExecuteNonQuery(sql, paras);
+                            };
+                            retrunRow += con.ExecuteNonQuery(sql, paras);
 
-                        sql =
-                        "INSERT INTO tp_pc_mould\n" +
-                        "  (MOULDID\n" +
-                        "  ,MOULDCODE\n" +
-                        "  ,MOULDBARCODE\n" +
-                        "  ,MOULDTYPE\n" +
-                        "  ,MATERIALSUPPLIER\n" +
-                        "  ,PRODUCTIONDATE\n" +
-                        "  ,GOODSID\n" +
-                        "  ,GOODSCODE\n" +
-                        "  ,USERID\n" +
-                        "  ,USERCODE\n" +
-                        "  ,WEIGHT\n" +
-                        "  ,COST\n" +
-                        "  ,STANDARDGROUTINGNUM\n" +
-                        "  ,OUTPUTCOUNT\n" +
-                        "  ,MOULDSTATUS\n" +
-                        "  ,PREMOULDSTATUS\n" +
-                        "  ,LASTCHANGEHISTORYID\n" +
-                        "  ,REMARKS\n" +
-                        "  ,MOULD_PLAN_ID\n" + //add 夏常明 模具生产计划id 2023-6-26
-                        "  ,ACCOUNTID\n" +
-                        "  ,CREATEUSERID\n" +
-                        "  ,UPDATEUSERID)\n" +
-                        "VALUES\n" +
-                        "  (:MOULDID\n" +
-                        "  ,:MOULDCODE\n" +
-                        "  ,:MOULDBARCODE\n" +
-                        "  ,:MOULDTYPE\n" +
-                        "  ,:MATERIALSUPPLIER\n" +
-                        "  ,:PRODUCTIONDATE\n" +
-                        "  ,:GOODSID\n" +
-                        "  ,:GOODSCODE\n" +
-                        "  ,:USERID\n" +
-                        "  ,:USERCODE\n" +
-                        "  ,:WEIGHT\n" +
-                        "  ,:COST\n" +
-                        "  ,:STANDARDGROUTINGNUM\n" +
-                        "  ,:OUTPUTCOUNT\n" +
-                        "  ,:MOULDSTATUS\n" +
-                        "  ,:PREMOULDSTATUS\n" +
-                        "  ,:LASTCHANGEHISTORYID\n" +
-                        "  ,:REMARKS\n" +
-                        "  ,:MOULD_PLAN_ID\n" + //add 夏常明 模具生产计划id 2023-6-26
-                        "  ,:ACCOUNTID\n" +
-                        "  ,:CREATEUSERID\n" +
-                        "  ,:CREATEUSERID)";
-                        paras = new OracleParameter[]
-                        {
+                            sql =
+                            "INSERT INTO tp_pc_mould\n" +
+                            "  (MOULDID\n" +
+                            "  ,MOULDCODE\n" +
+                            "  ,MOULDBARCODE\n" +
+                            "  ,MOULDTYPE\n" +
+                            "  ,MATERIALSUPPLIER\n" +
+                            "  ,PRODUCTIONDATE\n" +
+                            "  ,GOODSID\n" +
+                            "  ,GOODSCODE\n" +
+                            "  ,USERID\n" +
+                            "  ,USERCODE\n" +
+                            "  ,WEIGHT\n" +
+                            "  ,COST\n" +
+                            "  ,STANDARDGROUTINGNUM\n" +
+                            "  ,OUTPUTCOUNT\n" +
+                            "  ,MOULDSTATUS\n" +
+                            "  ,PREMOULDSTATUS\n" +
+                            "  ,LASTCHANGEHISTORYID\n" +
+                            "  ,REMARKS\n" +
+                            "  ,MOULD_PLAN_ID\n" + //add 夏常明 模具生产计划id 2023-6-26
+                            "  ,ACCOUNTID\n" +
+                            "  ,CREATEUSERID\n" +
+                            "  ,UPDATEUSERID)\n" +
+                            "VALUES\n" +
+                            "  (:MOULDID\n" +
+                            "  ,:MOULDCODE\n" +
+                            "  ,:MOULDBARCODE\n" +
+                            "  ,:MOULDTYPE\n" +
+                            "  ,:MATERIALSUPPLIER\n" +
+                            "  ,:PRODUCTIONDATE\n" +
+                            "  ,:GOODSID\n" +
+                            "  ,:GOODSCODE\n" +
+                            "  ,:USERID\n" +
+                            "  ,:USERCODE\n" +
+                            "  ,:WEIGHT\n" +
+                            "  ,:COST\n" +
+                            "  ,:STANDARDGROUTINGNUM\n" +
+                            "  ,:OUTPUTCOUNT\n" +
+                            "  ,:MOULDSTATUS\n" +
+                            "  ,:PREMOULDSTATUS\n" +
+                            "  ,:LASTCHANGEHISTORYID\n" +
+                            "  ,:REMARKS\n" +
+                            "  ,:MOULD_PLAN_ID\n" + //add 夏常明 模具生产计划id 2023-6-26
+                            "  ,:ACCOUNTID\n" +
+                            "  ,:CREATEUSERID\n" +
+                            "  ,:CREATEUSERID)";
+                            paras = new OracleParameter[]
+                            {
                             new OracleParameter(":MOULDCODE", OracleDbType.Varchar2,
                                 mouldcode, ParameterDirection.Input),
                             new OracleParameter(":MOULDSTATUS", OracleDbType.Int32,
@@ -2580,8 +2738,9 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleService
                                 sUserInfo.AccountID, ParameterDirection.Input),
                             new OracleParameter(":CREATEUSERID", OracleDbType.Int32,
                                 sUserInfo.UserID, ParameterDirection.Input),
-                        };
-                        retrunRow += con.ExecuteNonQuery(sql, paras);
+                            };
+                            retrunRow += con.ExecuteNonQuery(sql, paras);
+                        } 
 
                         //更新模具生产计划完成数量 添加报工履历 add 夏常明 2023-6-26
                         if (!string.IsNullOrEmpty(cre.Properties["MOULD_PLAN_ID"] + ""))
@@ -3053,9 +3212,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleService
                 };
 
                 DataTable mouldTable = con.GetSqlResultToDt(sql, paras);
-
-
-
+                
                 // 变更型号
                 if (mouldOperationType == (int)Constant.MouldOperationType.ChangeGoodsCode)
                 {
@@ -3953,6 +4110,102 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleService
                     }
 
                 }
+                // 模具干燥
+                else if (mouldOperationType == (int)Constant.MouldOperationType.MakeMould)
+                {
+                    #region
+                    foreach (DataRow item in mouldTable.Rows)
+                    {
+                        int mouldStatus = Convert.ToInt32(item["MouldStatus"]);
+                        if (mouldStatus != 5)
+                        {
+                            continue;
+                        }
+
+                        int mouldHistoryID = Convert.ToInt32(con.GetSqlResultToObj("select seq_pc_mouldhistory_id.nextval from dual "));
+
+                        sql =
+                        "INSERT INTO tp_pc_mouldchangehistory\n" +
+                        "  (CHANGEID\n" +
+                        "  ,MOULDID\n" +
+                        "  ,MOULDCODE\n" +
+                        "  ,MOULDBARCODE\n" +
+                        "  ,GOODSID\n" +
+                        "  ,GOODSCODE\n" +
+                        "  ,OPERATIONTYPE\n" +
+                        "  ,MOULDSTATUS\n" +
+                        "  ,MOULDSTATUSAFTER\n" +
+                        "  ,GROUTINGNUM\n" +
+                        "  ,REMARKS\n" +
+                        "  ,CHANGEFLAG\n" +
+                        "  ,ACCOUNTID\n" +
+                        "  ,CREATEUSERID)\n" +
+                        "  Values( :changeID\n" +
+                        "        ,:MOULDID\n" +
+                        "        ,:MOULDCODE\n" +
+                        "        ,:MOULDBARCODE\n" +
+                        "        ,:GOODSID\n" +
+                        "        ,:GOODSCODE\n" +
+                        "        ,1\n" +
+                        "        ,:MOULDSTATUS\n" +
+                        "        ,:MOULDSTATUSAFTER\n" +
+                        "        ,:GROUTINGNUM\n" +
+                        "        ,:REMARKS\n" +
+                        "        ,'1'\n" +
+                        "        ,:ACCOUNTID\n" +
+                        "        ,:USERID\n" +
+                        ")";
+                        paras = new OracleParameter[]
+                        {
+                            new OracleParameter(":changeID", OracleDbType.Int32,
+                                mouldHistoryID, ParameterDirection.Input),
+                            new OracleParameter(":MOULDID", OracleDbType.Int32,
+                                item["MouldID"], ParameterDirection.Input),
+                            new OracleParameter(":MOULDCODE", OracleDbType.Varchar2,
+                                item["MOULDCODE"], ParameterDirection.Input),
+                            new OracleParameter(":MOULDBARCODE", OracleDbType.NVarchar2,
+                                item["MOULDBARCODE"], ParameterDirection.Input),
+                            new OracleParameter(":GOODSID", OracleDbType.Int32,
+                                item["GOODSID"], ParameterDirection.Input),
+                            new OracleParameter(":GOODSCODE", OracleDbType.NVarchar2,
+                                item["GOODSCODE"], ParameterDirection.Input),
+                            new OracleParameter(":MOULDSTATUSAFTER", OracleDbType.Int32,
+                                (int)Constant.MouldStatus.Inv, ParameterDirection.Input),
+                            new OracleParameter(":MOULDSTATUS", OracleDbType.Int32,
+                                item["MOULDSTATUS"], ParameterDirection.Input),
+                            new OracleParameter(":GROUTINGNUM", OracleDbType.Int32,
+                                item["GROUTINGNUM"], ParameterDirection.Input),
+                            new OracleParameter(":REMARKS", OracleDbType.NVarchar2,
+                                cre.Properties["Remarks"], ParameterDirection.Input),
+                            new OracleParameter(":ACCOUNTID", OracleDbType.Int32,
+                                sUserInfo.AccountID, ParameterDirection.Input),
+                            new OracleParameter(":USERID", OracleDbType.Int32,
+                                sUserInfo.UserID, ParameterDirection.Input),
+                        };
+                        retrunRow += con.ExecuteNonQuery(sql, paras);
+
+                        sql = "UPDATE tp_pc_mould m\n" +
+                        "   SET m.premouldstatus      = m.mouldstatus\n" +
+                        "      ,m.mouldstatus         = :mouldstatus\n" +
+                        "      ,m.updateuserid        = :userid\n" +
+                        "      ,m.lastchangehistoryid = :changeid\n" +
+                        " WHERE m.mouldid = :mouldid";
+
+                        paras = new OracleParameter[]
+                        {
+                            new OracleParameter(":mouldstatus", OracleDbType.Int32,
+                                (int)Constant.MouldStatus.Inv, ParameterDirection.Input),
+                            new OracleParameter(":changeid", OracleDbType.Int32,
+                                mouldHistoryID, ParameterDirection.Input),
+                            new OracleParameter(":userid", OracleDbType.Int32,
+                                sUserInfo.UserID, ParameterDirection.Input),
+                            new OracleParameter(":mouldid", OracleDbType.Int32,
+                                item["MouldID"], ParameterDirection.Input),
+                        };
+                        retrunRow += con.ExecuteNonQuery(sql, paras);
+                    }
+                    #endregion
+                }
 
                 con.Commit();
                 return sre;

WCF.Service/WCF.Services/PDAModuleService.cs

@@ -9294,6 +9294,23 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                                 return actionResult;
                             }
                             #endregion
+                            #region 模具干燥
+                            if (mouldOperationType == 14)
+                            {
+                                if (mouldStatusID == 5)
+                                {
+                                    actionResult.Status = (int)Constant.PDAResult.Success;
+                                    actionResult.Result = JsonHelper.ToJson(sre.Data.Tables[0]);
+                                }
+                                else
+                                {
+                                    actionResult.Status = (int)Constant.PDAResult.Fail;
+                                    actionResult.Result = -2;
+                                    actionResult.Message = "模具【" + data["MouldBarcode"] + "】当前状态为【" + mouldStatusName + "】，不能进行模具干燥操作";
+                                }
+                                return actionResult;
+                            }
+                            #endregion
                             return actionResult;
                         }
                     }