Merge branch 'master' of http://git.dongkesoft.com:9001/hg5020/dk.hg5020.wcf

DK.Client/SAPDataModule/Hegii/F_SAP_HEGII_0109.cs

@@ -237,7 +237,7 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule.Hegii
                     return;
                 }
 
-                 rows = checkedDt.Select("SyncFlagName = '已同步'");
+                 rows = checkedDt.Select("SyncFlagName = '已同步' or SyncFlagName = 'BPM系统审批不通过'");
                 if (rows.Length > 0)
                 {
                     DKMessageBox.ShowDialog(this, DKMessageCode.W_CMN_S_004, "已同步数据不能撤销");
@@ -380,6 +380,11 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule.Hegii
                     DKMessageBox.ShowDialog(this, DKMessageCode.I_CMN_S_002);
                     tsbtnSearch_Click(null, null);
                 }
+                else
+				{
+                    DKMessageBox.ShowDialog(this, DKMessageCode.W_CMN_S_004, sre.Message);
+                    return;
+                }
 
             }
             catch (Exception ex)

DK.Service/PMModuleLogic/PMModuleLogic.cs

@@ -3497,7 +3497,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                                           ,bis.matnr
                                           ,bis.idnrk
                                           ,bis.meins
-                                          ,bis.menge mengesum
+                                          ,to_char(bis.menge,'FM9999999999999999.000')   mengesum
                                           ,bis.idnrkname
                                           ,bis.idnrkonlycode
                                       FROM tp_pm_barcodeidnrkscrap bis
@@ -3515,7 +3515,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 else
 				{
                     string sqlString = @"SELECT      0 scrapid
-                                                      ,SUM(bis.menge) mengesum
+                                                      ,to_char(SUM(bis.menge),'FM9999999999999999.000')  mengesum
                                                       ,bis.matnr
                                                       ,bis.idnrk
                                                       ,bis.meins

DK.Service/SAPDataService/SAPDataLogicPartial.cs

@@ -1760,8 +1760,10 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
                                                 '未同步'
                                                WHEN bis.syncflag = 1 THEN
                                                 '已同步'
-                                               ELSE
+                                               when bis.syncflag = 2 THEN
                                                 'BPM系统审批不通过'
+                                               when bis.syncflag = 3 THEN
+                                                'BPM系统审批通过'
                                            END syncflagname
                                           ,mu.username createusername
                                           ,bis.createtime
@@ -1997,7 +1999,7 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
                                           FROM tp_pm_barcodeidnrkscrap bis
                                          WHERE instr(:scrapid,',' || bis.scrapid || ',') > 0
                                            AND bis.accountid = :accountid
-                                           AND (valueflag = 0 OR checkflag = 0 OR bis.syncflag = 1 OR bis.scraptype = 2 OR
+                                           AND (valueflag = 0 OR checkflag = 0 OR bis.syncflag =1 OR bis.scraptype = 2 OR
                                                 bis.incident IS NOT NULL)";
 					OracleParameter[] oracleParameter = new OracleParameter[]
 			   {
@@ -2046,27 +2048,48 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
 						{
 							string strResult = BPMDataLogic.PushBPM(item);
 							Dictionary<string, object> data = JsonConvert.DeserializeObject<Dictionary<string, object>>(strResult);
-							string isSeccess = "2";//bpm 审批不通过
+							string isSeccess = "0";//bpm 同步失败
 							if (data["Result"].ToString() == "1")
 							{
 								isSeccess = "1";
-							}
-							//更新报损履历
-							sqlString = @" UPDATE tp_pm_barcodeidnrkscrap
+
+								//更新报损履历
+								sqlString = @" UPDATE tp_pm_barcodeidnrkscrap
 												SET syncflag     = :syncflag
 												   ,errormessage = :message
 												   ,documentno   = :documentno
 												   ,incident     = :incident
 											  WHERE instr(',' || :scrapids || ',',',' || scrapid || ',') > 0";
-							oracleParameter = new OracleParameter[]
-						 {
+								oracleParameter = new OracleParameter[]
+							 {
 								new OracleParameter(":scrapids",OracleDbType.NVarchar2, item["scrapids"].ToString(), ParameterDirection.Input),
 								new OracleParameter(":syncflag",OracleDbType.NVarchar2, isSeccess,ParameterDirection.Input),
 								new OracleParameter(":message",OracleDbType.NVarchar2, data["ErrorMessage"].ToString(),ParameterDirection.Input),
 								new OracleParameter(":documentno",OracleDbType.NVarchar2, data["DOCUMENTNO"].ToString(),ParameterDirection.Input),
 								new OracleParameter(":incident",OracleDbType.NVarchar2, data["Incident"].ToString(),ParameterDirection.Input),
-						 };
-							returnRows += oracleTrConn.ExecuteNonQuery(sqlString, oracleParameter);
+							 };
+								returnRows += oracleTrConn.ExecuteNonQuery(sqlString, oracleParameter);
+							}
+							else
+							{
+								//更新报损履历
+								sqlString = @" UPDATE tp_pm_barcodeidnrkscrap
+												SET syncflag     = :syncflag
+												   ,errormessage = :message
+												   ,incident     = :incident
+											  WHERE instr( ',' || :scrapids || ',',',' || scrapid || ',') > 0";
+								oracleParameter = new OracleParameter[]
+							 {
+								new OracleParameter(":scrapids",OracleDbType.NVarchar2, item["scrapids"].ToString(), ParameterDirection.Input),
+								new OracleParameter(":syncflag",OracleDbType.NVarchar2, isSeccess,ParameterDirection.Input),
+								new OracleParameter(":message",OracleDbType.NVarchar2, data["ErrorMessage"].ToString(),ParameterDirection.Input),
+								new OracleParameter(":incident",OracleDbType.NVarchar2, data["Incident"].ToString(),ParameterDirection.Input),
+							 };
+								sre.OtherStatus = -1;
+								sre.Message = data["ErrorMessage"].ToString();
+								return sre;
+							}
+							
 						}
 					}
 				}
@@ -2137,31 +2160,52 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
 						{
 							string strResult = BPMDataLogic.PushBPM(item);
 							Dictionary<string, object> data = JsonConvert.DeserializeObject<Dictionary<string, object>>(strResult);
-							string isSeccess = "2";//bpm 审批不通过
+							string isSeccess = "0";//bpm 审批不通过
 							if (data["Result"].ToString() == "1")
 							{
 								isSeccess = "1";
-							}
-							//更新报损履历
-							sqlString = @" UPDATE tp_pm_barcodeidnrkscrap
+								//更新报损履历
+								sqlString = @" UPDATE tp_pm_barcodeidnrkscrap
 												SET syncflag     = :syncflag
 												   ,errormessage = :message
 												   ,documentno   = :documentno
 												   ,incident     = :incident
 											  WHERE instr( ',' || :scrapids || ',',',' || scrapid || ',') > 0";
-							oracleParameter = new OracleParameter[]
-						 {
+								oracleParameter = new OracleParameter[]
+							 {
 								new OracleParameter(":scrapids",OracleDbType.NVarchar2, item["scrapids"].ToString(), ParameterDirection.Input),
 								new OracleParameter(":syncflag",OracleDbType.NVarchar2, isSeccess,ParameterDirection.Input),
 								new OracleParameter(":message",OracleDbType.NVarchar2, data["ErrorMessage"].ToString(),ParameterDirection.Input),
 								new OracleParameter(":documentno",OracleDbType.NVarchar2, data["DOCUMENTNO"].ToString(),ParameterDirection.Input),
 								new OracleParameter(":incident",OracleDbType.NVarchar2, data["Incident"].ToString(),ParameterDirection.Input),
-						 };
-							returnRows += oracleTrConn.ExecuteNonQuery(sqlString, oracleParameter);
+							 };
+								returnRows += oracleTrConn.ExecuteNonQuery(sqlString, oracleParameter);
+							}
+							else
+							{
+								//更新报损履历
+								sqlString = @" UPDATE tp_pm_barcodeidnrkscrap
+												SET syncflag     = :syncflag
+												   ,errormessage = :message
+												   ,incident     = :incident
+											  WHERE instr( ',' || :scrapids || ',',',' || scrapid || ',') > 0";
+								oracleParameter = new OracleParameter[]
+							 {
+								new OracleParameter(":scrapids",OracleDbType.NVarchar2, item["scrapids"].ToString(), ParameterDirection.Input),
+								new OracleParameter(":syncflag",OracleDbType.NVarchar2, isSeccess,ParameterDirection.Input),
+								new OracleParameter(":message",OracleDbType.NVarchar2, data["ErrorMessage"].ToString(),ParameterDirection.Input),
+								new OracleParameter(":incident",OracleDbType.NVarchar2, data["Incident"].ToString(),ParameterDirection.Input),
+							 };
+								sre.OtherStatus = -1;
+								sre.Message = data["ErrorMessage"].ToString();
+								return sre;
+							}
+							
 						}
 					}
 				}
 				#endregion
+
 				sre.OtherStatus = returnRows;
 				oracleTrConn.Commit();
 			}