次品-报废 删除在产表，插入报废表

DK.Service/DKIBOSSPRDLogic/DKIBOSSPRDLogic.cs

@@ -62,6 +62,7 @@ namespace Dongke.IBOSS.PRD.Service.DKIBOSSPRDLogic
                     new OracleParameter("in_SessionKey",requestEntity.SessionKey),
                     new OracleParameter("in_ComputerName",requestEntity.ComputerName),
                     new OracleParameter("in_IP",requestEntity.IPAddress),
+                    new OracleParameter("in_IMEI",requestEntity.IMEI),
                     new OracleParameter("in_LoginType",actionType),
                     new OracleParameter("out_LoginStatus",OracleDbType.Int16, ParameterDirection.Output),
                     new OracleParameter("out_UserOrganization",OracleDbType.RefCursor, ParameterDirection.Output),

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -9333,12 +9333,16 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                     if (productionData.OrgGoodsLevelTypeID == Constant.GoodsLevelType.Reject.GetHashCode()
                         || 
                         productionData.OrgGoodsLevelTypeID == Constant.GoodsLevelType.Waste.GetHashCode()
+                        ||
+                        productionData.OrgGoodsLevelTypeID == 20 // 中陶特加 废品（废品就是报费，直接扔的那种） 2024-07-09
                         )
                     {
                         //改为 次品 废品 xuwei modify 2019-12-13 加入废品识别
                         if (productionData.GoodsLevelTypeID == Constant.GoodsLevelType.Reject.GetHashCode()
                             ||
                             productionData.GoodsLevelTypeID == Constant.GoodsLevelType.Waste.GetHashCode()
+                            ||
+                            productionData.GoodsLevelTypeID == 20 // 中陶特加 废品（废品就是报费，直接扔的那种） 2024-07-09
                             )
                         {
                             // 删除生产数据及相关表与报损表
@@ -9350,8 +9354,10 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                             RejectToReject = true;
                         } //改为不是 次品 废品 xuwei modify 2019-12-13 加入废品识别
                         else if (productionData.GoodsLevelTypeID != Constant.GoodsLevelType.Reject.GetHashCode()
-                            ||
+                            &&
                             productionData.GoodsLevelTypeID != Constant.GoodsLevelType.Waste.GetHashCode()
+                            &&
+                            productionData.GoodsLevelTypeID != 20 // 中陶特加 废品（废品就是报费，直接扔的那种） 2024-07-09
                             )
                         {
                             // 删除生产数据及相关表与报损表
@@ -9452,6 +9458,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 else if (productionData.GoodsLevelTypeID == (int)Constant.GoodsLevelType.Reject
                         ||
                         productionData.GoodsLevelTypeID == (int)Constant.GoodsLevelType.Waste
+                        ||
+                        productionData.GoodsLevelTypeID == 20 // 中陶特加 废品（废品就是报费，直接扔的那种） 2024-07-09
                     )
                 {
                     //productionData.GoodsLevelID = null;

DK.Service/SystemModuleLogic/SystemModuleLogic.cs

@@ -55,6 +55,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					new OracleParameter("in_SessionKey",requestEntity.SessionKey),
 					new OracleParameter("in_ComputerName",requestEntity.ComputerName),
 					new OracleParameter("in_IP",requestEntity.IPAddress),
+					new OracleParameter("in_IMEI",requestEntity.IMEI),
 					new OracleParameter("in_LoginType",actionType),
 					new OracleParameter("out_LoginStatus",OracleDbType.Int16, ParameterDirection.Output),
 					new OracleParameter("out_UserOrganization",OracleDbType.RefCursor, ParameterDirection.Output),

WCF.Service/WCF.Hosting/Config.ini

@@ -3,12 +3,12 @@ ServiceName=
 Description=
 
 [DBSetting]
-DBIP=10.0.8.2
+DBIP=10.0.8.4
 DBPort=1521
 #SID=ibossmes
 #DBUser=devhgcz
-SID=dkmes
-DBUser=mes
+SID=mestest
+DBUser=mestest
 DBPassword=etLHPkLTOLw=
 
 [WCFSetting]