Merge branch 'master' of http://s.dev01.dkiboss.com:9001/DK-MES-2.0/HEGII.ss.mes.wcf

DK.Client/PMModule/F_PM_3501.Designer.cs

@@ -62,6 +62,12 @@
 			this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
 			this.dgvSendDetail = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
 			this.dgvSend = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+			this.SENDOUTGOODSLOGDETAILID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GOODSCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.MATERIALCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.MATERIALREMARK = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.BANMA = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.BINDINGCOUNT = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.SENDOUTGOODSLOGID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.SENDOUTCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.USERID = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -74,21 +80,15 @@
 			this.SYNCSTATUS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.SYNCSTATUSNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.SYNCTIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.ISREVOKE = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+			this.ISREVOKE = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.REVOKETIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.ISAMENDS = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+			this.ISAMENDS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.AMENDSTIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.CREATETIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.CREATEUSERNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UPDATETIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UPDATEUSERNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.REMARKS = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.SENDOUTGOODSLOGDETAILID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GOODSCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.MATERIALCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.MATERIALREMARK = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.BANMA = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.BINDINGCOUNT = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvSendDetail)).BeginInit();
@@ -573,6 +573,51 @@
 			this.dgvSend.VirtualNodes = false;
 			this.dgvSend.SelectionChanged += new System.EventHandler(this.dgvSend_SelectionChanged);
 			// 
+			// SENDOUTGOODSLOGDETAILID
+			// 
+			this.SENDOUTGOODSLOGDETAILID.DataPropertyName = "SENDOUTGOODSLOGDETAILID";
+			this.SENDOUTGOODSLOGDETAILID.HeaderText = "明细ID";
+			this.SENDOUTGOODSLOGDETAILID.Name = "SENDOUTGOODSLOGDETAILID";
+			this.SENDOUTGOODSLOGDETAILID.ReadOnly = true;
+			this.SENDOUTGOODSLOGDETAILID.Visible = false;
+			// 
+			// GOODSCODE
+			// 
+			this.GOODSCODE.DataPropertyName = "GOODSCODE";
+			this.GOODSCODE.HeaderText = "产品型号";
+			this.GOODSCODE.Name = "GOODSCODE";
+			this.GOODSCODE.ReadOnly = true;
+			// 
+			// MATERIALCODE
+			// 
+			this.MATERIALCODE.DataPropertyName = "MATERIALCODE";
+			this.MATERIALCODE.HeaderText = "物料编码";
+			this.MATERIALCODE.Name = "MATERIALCODE";
+			this.MATERIALCODE.ReadOnly = true;
+			this.MATERIALCODE.Width = 150;
+			// 
+			// MATERIALREMARK
+			// 
+			this.MATERIALREMARK.DataPropertyName = "MATERIALREMARK";
+			this.MATERIALREMARK.HeaderText = "物料名称";
+			this.MATERIALREMARK.Name = "MATERIALREMARK";
+			this.MATERIALREMARK.ReadOnly = true;
+			this.MATERIALREMARK.Width = 150;
+			// 
+			// BANMA
+			// 
+			this.BANMA.DataPropertyName = "BANMA";
+			this.BANMA.HeaderText = "板码";
+			this.BANMA.Name = "BANMA";
+			this.BANMA.ReadOnly = true;
+			// 
+			// BINDINGCOUNT
+			// 
+			this.BINDINGCOUNT.DataPropertyName = "BINDINGCOUNT";
+			this.BINDINGCOUNT.HeaderText = "绑板数量";
+			this.BINDINGCOUNT.Name = "BINDINGCOUNT";
+			this.BINDINGCOUNT.ReadOnly = true;
+			// 
 			// SENDOUTGOODSLOGID
 			// 
 			this.SENDOUTGOODSLOGID.DataPropertyName = "SENDOUTGOODSLOGID";
@@ -663,13 +708,10 @@
 			// ISREVOKE
 			// 
 			this.ISREVOKE.DataPropertyName = "ISREVOKE";
-			this.ISREVOKE.FalseValue = "0";
 			this.ISREVOKE.HeaderText = "是否撤销";
 			this.ISREVOKE.Name = "ISREVOKE";
 			this.ISREVOKE.ReadOnly = true;
 			this.ISREVOKE.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-			this.ISREVOKE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-			this.ISREVOKE.TrueValue = "1";
 			// 
 			// REVOKETIME
 			// 
@@ -681,13 +723,10 @@
 			// ISAMENDS
 			// 
 			this.ISAMENDS.DataPropertyName = "ISAMENDS";
-			this.ISAMENDS.FalseValue = "0";
 			this.ISAMENDS.HeaderText = "是否补推";
 			this.ISAMENDS.Name = "ISAMENDS";
 			this.ISAMENDS.ReadOnly = true;
 			this.ISAMENDS.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-			this.ISAMENDS.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-			this.ISAMENDS.TrueValue = "1";
 			// 
 			// AMENDSTIME
 			// 
@@ -731,51 +770,6 @@
 			this.REMARKS.Name = "REMARKS";
 			this.REMARKS.ReadOnly = true;
 			// 
-			// SENDOUTGOODSLOGDETAILID
-			// 
-			this.SENDOUTGOODSLOGDETAILID.DataPropertyName = "SENDOUTGOODSLOGDETAILID";
-			this.SENDOUTGOODSLOGDETAILID.HeaderText = "明细ID";
-			this.SENDOUTGOODSLOGDETAILID.Name = "SENDOUTGOODSLOGDETAILID";
-			this.SENDOUTGOODSLOGDETAILID.ReadOnly = true;
-			this.SENDOUTGOODSLOGDETAILID.Visible = false;
-			// 
-			// GOODSCODE
-			// 
-			this.GOODSCODE.DataPropertyName = "GOODSCODE";
-			this.GOODSCODE.HeaderText = "产品型号";
-			this.GOODSCODE.Name = "GOODSCODE";
-			this.GOODSCODE.ReadOnly = true;
-			// 
-			// MATERIALCODE
-			// 
-			this.MATERIALCODE.DataPropertyName = "MATERIALCODE";
-			this.MATERIALCODE.HeaderText = "物料编码";
-			this.MATERIALCODE.Name = "MATERIALCODE";
-			this.MATERIALCODE.ReadOnly = true;
-			this.MATERIALCODE.Width = 150;
-			// 
-			// MATERIALREMARK
-			// 
-			this.MATERIALREMARK.DataPropertyName = "MATERIALREMARK";
-			this.MATERIALREMARK.HeaderText = "物料名称";
-			this.MATERIALREMARK.Name = "MATERIALREMARK";
-			this.MATERIALREMARK.ReadOnly = true;
-			this.MATERIALREMARK.Width = 150;
-			// 
-			// BANMA
-			// 
-			this.BANMA.DataPropertyName = "BANMA";
-			this.BANMA.HeaderText = "板码";
-			this.BANMA.Name = "BANMA";
-			this.BANMA.ReadOnly = true;
-			// 
-			// BINDINGCOUNT
-			// 
-			this.BINDINGCOUNT.DataPropertyName = "BINDINGCOUNT";
-			this.BINDINGCOUNT.HeaderText = "绑板数量";
-			this.BINDINGCOUNT.Name = "BINDINGCOUNT";
-			this.BINDINGCOUNT.ReadOnly = true;
-			// 
 			// F_PM_3501
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -848,9 +842,9 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn SYNCSTATUS;
 		private System.Windows.Forms.DataGridViewTextBoxColumn SYNCSTATUSNAME;
 		private System.Windows.Forms.DataGridViewTextBoxColumn SYNCTIME;
-		private System.Windows.Forms.DataGridViewCheckBoxColumn ISREVOKE;
+		private System.Windows.Forms.DataGridViewTextBoxColumn ISREVOKE;
 		private System.Windows.Forms.DataGridViewTextBoxColumn REVOKETIME;
-		private System.Windows.Forms.DataGridViewCheckBoxColumn ISAMENDS;
+		private System.Windows.Forms.DataGridViewTextBoxColumn ISAMENDS;
 		private System.Windows.Forms.DataGridViewTextBoxColumn AMENDSTIME;
 		private System.Windows.Forms.DataGridViewTextBoxColumn CREATETIME;
 		private System.Windows.Forms.DataGridViewTextBoxColumn CREATEUSERNAME;

DK.Service/PMModuleLogic/PMModuleLogic.cs

@@ -4758,10 +4758,14 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                                                   S.SYNCSTATUS = 1 THEN '同步成功'  
                                                   WHEN S.SYNCSTATUS = 2 THEN '同步失败' 
                                                   ELSE '未同步' END AS SYNCSTATUSNAME,
-                                                  S.SYNCTIME,
-                                                  S.ISREVOKE,
-                                                  S.REVOKETIME,
-                                                  S.ISAMENDS ,
+                                                  S.SYNCTIME, 
+                                                  CASE WHEN  S.ISREVOKE = 1 THEN '撤销成功'  
+                                                  WHEN S.ISREVOKE = 2 THEN '撤销失败' 
+                                                  ELSE '' END AS ISREVOKE,
+                                                  S.REVOKETIME, 
+                                                  CASE WHEN  S.ISAMENDS = 1 THEN '补推成功'  
+                                                  WHEN S.ISAMENDS = 2 THEN '补推失败' 
+                                                  ELSE '' END AS ISAMENDS,
                                                   S.AMENDSTIME, 
                                                   S.CREATETIME,                 
                                                   U.USERNAME CREATEUSERNAME,        

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -31103,7 +31103,7 @@ updateuserid=:updateuserid where barcode=:barcode";
                 if (isSend != null && isSend.Rows.Count > 0)
                 {
                     result.Status = Constant.ServiceResultStatus.Other;// "存在已发货产品";
-                    result.Result = isSend;
+                    result.Result = isSend; 
                     return result;
                 }
                 //调用sap筛选库存不足 物料编码够不够 生成sap同步数据
@@ -31174,7 +31174,7 @@ updateuserid=:updateuserid where barcode=:barcode";
                 if (countList.Count > 0)//返回哪些库存不够(包装批次)
                 {
                     result.Status = Constant.ServiceResultStatus.DataChanged;// "库存不足";
-                    result.Result = countList;
+                    result.Result = countList; 
                     return result;
                 }
                 //成功
@@ -31197,13 +31197,13 @@ updateuserid=:updateuserid where barcode=:barcode";
                     {
 
                         result.Status = Constant.ServiceResultStatus.NoSearchResults;// "同步不成功";
-                        result.Result = ZMSG;
+                        result.Result = ZMSG; 
                     }
 
                 }
                 else
                 {
-                    result.Status = Constant.ServiceResultStatus.NoModifyData;// "同步返回空";
+                    result.Status = Constant.ServiceResultStatus.NoModifyData;// "同步返回空"; 
                 }
                 try
                 {
@@ -31217,10 +31217,9 @@ updateuserid=:updateuserid where barcode=:barcode";
                         var dtlog = oracleTrConn.GetSqlResultToDt("select MBLNR,SENDOUTGOODSLOGID from TP_PM_SENDOUTGOODSLOG WHERE SENDOUTCODE = '" + SENDOUTCODE + "'");
                         var PZ = dtlog.Rows[0]["MBLNR"];
                         SENDOUTGOODSLOGID = dtlog.Rows[0]["SENDOUTGOODSLOGID"].ToString();
+                        sql = "UPDATE TP_PM_SENDOUTGOODSLOG SET SYNCSTATUS = '" + SYNCSTATUS + "', SYNCTIME = SYSDATE, ISAMENDS = '" + SYNCSTATUS + "', AMENDSTIME = SYSDATE, UPDATETIME =SYSDATE, UPDATEUSERID = '" + userid + "',MBLNR = '" + MBLNR + "' WHERE SENDOUTGOODSLOGID = " + SENDOUTGOODSLOGID;
                         resultNumber += oracleTrConn.ExecuteNonQuery(sql, parmetersSql);
-                        sql = "UPDATE TP_PM_SENDOUTGOODSLOG SET  ISAMENDS = '" + SYNCSTATUS + "', AMENDSTIME = SYSDATE, UPDATETIME =SYSDATE, UPDATEUSERID = '" + userid + "',MBLNR = '" + MBLNR + "' WHERE SENDOUTCODE = '" + SENDOUTCODE + "'";
-                        resultNumber += oracleTrConn.ExecuteNonQuery(sql, parmetersSql);
-                        sql = "UPDATE TP_PM_SENDOUTSAPLOG SET  ZTYPE = '" + ZTYPE + "', MBLNR = '" + MBLNR + "', ZMSG = '" + ZMSG + "' WHERE MBLNR = '" + PZ + "'";
+                        sql = "UPDATE TP_PM_SENDOUTSAPLOG SET  ZTYPE = '" + ZTYPE + "', MBLNR = '" + MBLNR + "', ZMSG = '" + ZMSG + "' WHERE SENDOUTGOODSLOGID = " + SENDOUTGOODSLOGID;
                         resultNumber += oracleTrConn.ExecuteNonQuery(sql, parmetersSql);
                     }
                     else if (isCrete)
@@ -31671,15 +31670,15 @@ updateuserid=:updateuserid where barcode=:barcode";
                     }
                     else if (APIResult.Status == Constant.ServiceResultStatus.DataChanged)
                     {
-                        resultMessage += "发货单号:" + setEntity.SENDOUTCODE + "库存不足;" + "\n";
+                        resultMessage += "发货单号:" + setEntity.SENDOUTCODE + "SAP库存不足;" + "\n";
                     }
                     else if (APIResult.Status == Constant.ServiceResultStatus.NoSearchResults)
                     {
-                        resultMessage += "发货单号:" + setEntity.SENDOUTCODE + "同步不成功;" + "\n";
+                        resultMessage += "发货单号:" + setEntity.SENDOUTCODE + "SAP补推失败;" + "\n";
                     }
                     else if (APIResult.Status == Constant.ServiceResultStatus.NoModifyData)
                     {
-                        resultMessage += "发货单号:" + setEntity.SENDOUTCODE + "同步返回空;" + "\n";
+                        resultMessage += "发货单号:" + setEntity.SENDOUTCODE + "SAP补推返回空;" + "\n";
                     }
                     else if (APIResult.Status == Constant.ServiceResultStatus.DataDuplicated)
                     {
@@ -31692,7 +31691,7 @@ updateuserid=:updateuserid where barcode=:barcode";
                 }
                 ServiceResultEntity sre = new ServiceResultEntity();
                 sre.Status = Constant.ServiceResultStatus.Success;
-                sre.Result = resultMessage; 
+                sre.Message = resultMessage; 
                 return sre;
             }
             catch (Exception ex)