1.SAP产销卡控 2.产成品交接撤销汇总表增加筛选条件

DK.Client/PMModule/F_PM_1107.cs

@@ -809,6 +809,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 						if (inProductionList.Count != Constant.INT_IS_ZERO)
 						{
 							this._isScrapProductEntity = inProductionList[0];
+							return notes;
 						}
 						else
 						{

DK.Client/ReportModule/R03/M01/F_RPT_030117.Designer.cs

@@ -51,6 +51,7 @@
 			this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
 			this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
 			this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
+			this.ckflag = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
 			this.FHCheckBox = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
 			this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.FHTimeEnd = new System.Windows.Forms.DateTimePicker();
@@ -86,12 +87,12 @@
 			this.GoodsCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tblUndo = new System.Windows.Forms.TabControl();
 			this.tapLCUndoTotal = new System.Windows.Forms.TabPage();
-			this.tapLCUndoDetail = new System.Windows.Forms.TabPage();
 			this.dgvlc = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-			this.dgvlcDetail = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
 			this.LCCreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsCodeLC = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.lcCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.tapLCUndoDetail = new System.Windows.Forms.TabPage();
+			this.dgvlcDetail = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
 			this.lcFHTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.lcfhUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.lcBarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -105,6 +106,7 @@
 			this.DeliverDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.lcfhUndoTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.lcFhUndoUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.c_Label2 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			this.tapUndoDetail.SuspendLayout();
@@ -113,8 +115,8 @@
 			((System.ComponentModel.ISupportInitialize)(this.dgvUndoTotal)).BeginInit();
 			this.tblUndo.SuspendLayout();
 			this.tapLCUndoTotal.SuspendLayout();
-			this.tapLCUndoDetail.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvlc)).BeginInit();
+			this.tapLCUndoDetail.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvlcDetail)).BeginInit();
 			this.SuspendLayout();
 			// 
@@ -162,6 +164,8 @@
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.gbxCondition.BackColor = System.Drawing.Color.Transparent;
 			this.gbxCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbxCondition.BackgroundImage")));
+			this.gbxCondition.Controls.Add(this.c_Label2);
+			this.gbxCondition.Controls.Add(this.ckflag);
 			this.gbxCondition.Controls.Add(this.FHCheckBox);
 			this.gbxCondition.Controls.Add(this.c_Label1);
 			this.gbxCondition.Controls.Add(this.FHTimeEnd);
@@ -180,11 +184,22 @@
 			this.gbxCondition.Location = new System.Drawing.Point(4, 38);
 			this.gbxCondition.Name = "gbxCondition";
 			this.gbxCondition.OriginalHeight = -1;
-			this.gbxCondition.Size = new System.Drawing.Size(920, 74);
+			this.gbxCondition.Size = new System.Drawing.Size(920, 84);
 			this.gbxCondition.TabIndex = 1;
 			this.gbxCondition.TabStop = false;
 			this.gbxCondition.Text = "查询条件 ▼";
 			// 
+			// ckflag
+			// 
+			this.ckflag.AutoSize = true;
+			this.ckflag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.ckflag.Location = new System.Drawing.Point(601, 21);
+			this.ckflag.Name = "ckflag";
+			this.ckflag.Size = new System.Drawing.Size(156, 16);
+			this.ckflag.TabIndex = 18;
+			this.ckflag.Text = "过滤撤销时间再交接产品";
+			this.ckflag.UseVisualStyleBackColor = true;
+			// 
 			// FHCheckBox
 			// 
 			this.FHCheckBox.AutoSize = true;
@@ -278,12 +293,12 @@
 			// 
 			// btnSearch
 			// 
-			this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.btnSearch.BackColor = System.Drawing.Color.Transparent;
 			this.btnSearch.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSearch.BackgroundImage")));
 			this.btnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.btnSearch.ForeColor = System.Drawing.Color.White;
-			this.btnSearch.Location = new System.Drawing.Point(738, 15);
+			this.btnSearch.Location = new System.Drawing.Point(738, 48);
 			this.btnSearch.Name = "btnSearch";
 			this.btnSearch.Size = new System.Drawing.Size(85, 30);
 			this.btnSearch.TabIndex = 12;
@@ -293,12 +308,12 @@
 			// 
 			// btnClearCondition
 			// 
-			this.btnClearCondition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.btnClearCondition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.btnClearCondition.BackColor = System.Drawing.Color.Transparent;
 			this.btnClearCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnClearCondition.BackgroundImage")));
 			this.btnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.btnClearCondition.ForeColor = System.Drawing.Color.White;
-			this.btnClearCondition.Location = new System.Drawing.Point(829, 15);
+			this.btnClearCondition.Location = new System.Drawing.Point(829, 48);
 			this.btnClearCondition.Name = "btnClearCondition";
 			this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
 			this.btnClearCondition.TabIndex = 13;
@@ -672,16 +687,6 @@
 			this.tapLCUndoTotal.Text = "裸瓷交接撤销汇总表";
 			this.tapLCUndoTotal.UseVisualStyleBackColor = true;
 			// 
-			// tapLCUndoDetail
-			// 
-			this.tapLCUndoDetail.Controls.Add(this.dgvlcDetail);
-			this.tapLCUndoDetail.Location = new System.Drawing.Point(4, 22);
-			this.tapLCUndoDetail.Name = "tapLCUndoDetail";
-			this.tapLCUndoDetail.Size = new System.Drawing.Size(916, 359);
-			this.tapLCUndoDetail.TabIndex = 3;
-			this.tapLCUndoDetail.Text = "裸瓷交接撤销明细表";
-			this.tapLCUndoDetail.UseVisualStyleBackColor = true;
-			// 
 			// dgvlc
 			// 
 			this.dgvlc.AllowUserToAddRows = false;
@@ -745,6 +750,37 @@
 			this.dgvlc.ViewRowFilter = "";
 			this.dgvlc.VirtualNodes = false;
 			// 
+			// LCCreateTime
+			// 
+			this.LCCreateTime.DataPropertyName = "CreateTime";
+			this.LCCreateTime.HeaderText = "裸瓷撤销时间";
+			this.LCCreateTime.Name = "LCCreateTime";
+			this.LCCreateTime.ReadOnly = true;
+			// 
+			// GoodsCodeLC
+			// 
+			this.GoodsCodeLC.DataPropertyName = "GoodsCode";
+			this.GoodsCodeLC.HeaderText = "产品编码";
+			this.GoodsCodeLC.Name = "GoodsCodeLC";
+			this.GoodsCodeLC.ReadOnly = true;
+			// 
+			// lcCount
+			// 
+			this.lcCount.DataPropertyName = "Count";
+			this.lcCount.HeaderText = "数量";
+			this.lcCount.Name = "lcCount";
+			this.lcCount.ReadOnly = true;
+			// 
+			// tapLCUndoDetail
+			// 
+			this.tapLCUndoDetail.Controls.Add(this.dgvlcDetail);
+			this.tapLCUndoDetail.Location = new System.Drawing.Point(4, 22);
+			this.tapLCUndoDetail.Name = "tapLCUndoDetail";
+			this.tapLCUndoDetail.Size = new System.Drawing.Size(916, 359);
+			this.tapLCUndoDetail.TabIndex = 3;
+			this.tapLCUndoDetail.Text = "裸瓷交接撤销明细表";
+			this.tapLCUndoDetail.UseVisualStyleBackColor = true;
+			// 
 			// dgvlcDetail
 			// 
 			this.dgvlcDetail.AllowUserToAddRows = false;
@@ -818,27 +854,6 @@
 			this.dgvlcDetail.ViewRowFilter = "";
 			this.dgvlcDetail.VirtualNodes = false;
 			// 
-			// LCCreateTime
-			// 
-			this.LCCreateTime.DataPropertyName = "CreateTime";
-			this.LCCreateTime.HeaderText = "裸瓷撤销时间";
-			this.LCCreateTime.Name = "LCCreateTime";
-			this.LCCreateTime.ReadOnly = true;
-			// 
-			// GoodsCodeLC
-			// 
-			this.GoodsCodeLC.DataPropertyName = "GoodsCode";
-			this.GoodsCodeLC.HeaderText = "产品编码";
-			this.GoodsCodeLC.Name = "GoodsCodeLC";
-			this.GoodsCodeLC.ReadOnly = true;
-			// 
-			// lcCount
-			// 
-			this.lcCount.DataPropertyName = "Count";
-			this.lcCount.HeaderText = "数量";
-			this.lcCount.Name = "lcCount";
-			this.lcCount.ReadOnly = true;
-			// 
 			// lcFHTime
 			// 
 			this.lcFHTime.DataPropertyName = "FHTime";
@@ -930,6 +945,18 @@
 			this.lcFhUndoUserCode.Name = "lcFhUndoUserCode";
 			this.lcFhUndoUserCode.ReadOnly = true;
 			// 
+			// c_Label2
+			// 
+			this.c_Label2.AutoSize = true;
+			this.c_Label2.BackColor = System.Drawing.Color.Transparent;
+			this.c_Label2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.c_Label2.ForeColor = System.Drawing.Color.Red;
+			this.c_Label2.Location = new System.Drawing.Point(751, 22);
+			this.c_Label2.Name = "c_Label2";
+			this.c_Label2.Size = new System.Drawing.Size(137, 12);
+			this.c_Label2.TabIndex = 19;
+			this.c_Label2.Text = "(仅生效产成品交接报表)";
+			// 
 			// F_RPT_030117
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -952,8 +979,8 @@
 			((System.ComponentModel.ISupportInitialize)(this.dgvUndoTotal)).EndInit();
 			this.tblUndo.ResumeLayout(false);
 			this.tapLCUndoTotal.ResumeLayout(false);
-			this.tapLCUndoDetail.ResumeLayout(false);
 			((System.ComponentModel.ISupportInitialize)(this.dgvlc)).EndInit();
+			this.tapLCUndoDetail.ResumeLayout(false);
 			((System.ComponentModel.ISupportInitialize)(this.dgvlcDetail)).EndInit();
 			this.ResumeLayout(false);
 
@@ -1019,5 +1046,7 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn DeliverDate;
 		private System.Windows.Forms.DataGridViewTextBoxColumn lcfhUndoTime;
 		private System.Windows.Forms.DataGridViewTextBoxColumn lcFhUndoUserCode;
+		private Basics.BaseControls.C_CheckBox ckflag;
+		private Basics.BaseControls.C_Label c_Label2;
 	}
 }

DK.Client/ReportModule/R03/M01/F_RPT_030117.cs

@@ -321,6 +321,15 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 				this._orderEntityBySearch.FHTimeEnd = this.FHTimeEnd.Value;
 			}
 			this._orderEntityBySearch.GoodsModel = this.txtGoodsModel.Text.Trim();
+			//过滤撤销时间再交接产品
+			if (this.ckflag.Checked)
+			{
+				this._orderEntityBySearch.FhFlag = "1";
+			}
+			else
+			{
+				this._orderEntityBySearch.FhFlag = "0";
+			}
 			return this._orderEntityBySearch;
 		}
 

DK.Client/SystemModule/F_MST_0401.cs

@@ -532,6 +532,20 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
                                 break;
                             #endregion
 
+                            #region 计划卡控管理
+                            //产成品交接卡控 1：开启卡控；0：关闭卡控
+                            case "S_PC_002":
+                                string caontrolFlag = _systemData.Rows[i][loadWay] + "";
+                                if (caontrolFlag == "0")
+                                {
+                                    this.chkControl.Checked = false;
+                                }
+                                else if (caontrolFlag == "1")
+                                {
+                                    this.chkControl.Checked = true;
+                                } 
+                                break;
+                            #endregion
                             default:
                                 break;
                         }
@@ -741,6 +755,11 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
                             break;
                         #endregion
 
+                        #region 计划卡控管理
+                        case "S_PC_002":
+                            _systemData.Rows[i]["SettingValue"] = (this.chkControl.Checked ? "1" : "0");
+                            break;
+                        #endregion
                         default:
                             break;
                     }

DK.Service/PMModuleLogic/PMModuleLogicPartial.cs

@@ -19,8 +19,10 @@ using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Basics.Library;
 using Dongke.IBOSS.PRD.Service.CMNModuleService;
 using Dongke.IBOSS.PRD.Service.DataModels;
+using Dongke.IBOSS.PRD.Service.SAPHegiiDataService;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels.PMModule;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Oracle.ManagedDataAccess.Client;
 
@@ -5035,7 +5037,7 @@ and (TP_PM_ProductionDataIn.modeltype <> 5 or (exists (select 1 from tp_pm_grout
 					"               WHERE rownum = 1";
 
 					paras = new OracleParameter[]{
-						new OracleParameter(":Barcode",OracleDbType.Varchar2, barcode,ParameterDirection.Input),
+						new OracleParameter(":Barcode",OracleDbType.Varchar2, gbarcode,ParameterDirection.Input),
 					};
 					DataTable productionDataIDdt = oracleConn.GetSqlResultToDt(sql, paras);
 					if (productionDataIDdt != null && productionDataIDdt.Rows.Count > 0 && productionDataIDdt.Rows[0]["procedureid"].ToString() == "159" )
@@ -5236,6 +5238,122 @@ and (TP_PM_ProductionDataIn.modeltype <> 5 or (exists (select 1 from tp_pm_grout
 							return resultEntity;
 						}
 					}
+
+					//增加SAP接口校验产成品交接卡控数量->SAP根据物料判断STO单剩余可产出数量，小于不允许保存
+					//根据系统参数判断 是否开启卡控
+					//add by qq 20250918
+					#region 卡控产成品交接数量
+					//S_PC_002:计划卡控默认选项(产成品交接)
+					string sqs = "SELECT sss.settingcode, sss.settingvalue\n" +
+									"  FROM tp_mst_systemsetting sss\n" +
+									" WHERE sss.accountid = " + sUserInfo.AccountID + "\n" +
+									"   AND sss.settingcode  = 'S_PC_002'";
+					 
+					DataTable data = oracleConn.GetSqlResultToDt(sqs, null);
+					if (data != null && data.Rows.Count > 0)
+					{
+						string settingvalue = data.Rows[0]["settingvalue"].ToString();
+						string materialCode = dsResult.Tables[0].Rows[0]["MATERIALCODE"].ToString();
+						string ztype = "";
+						string message = "";
+						//开启校验
+						if (settingvalue == "1")
+						{
+							//查询接口数量
+							decimal stonum = 0;
+							// 配置文件
+							string postString = "{\"IN_WERKS\":\"" + "5000" + "\",\"IN_TABLE\":{\"item\":{\"MATNR\":\"" + materialCode + "\"}}}";
+							 
+							INIUtility ini = INIUtility.Instance(INIUtility.IniFile.SAP_HEGII);
+							string url082 = ini.ReadIniData("SAP_NEW_INFO", "Url082");
+							//测试
+							//url082 = "http://hgs4podev.hegii.com:50200/RESTAdapter/DKMES/ZMMFM082";
+
+							string result = string.Empty;
+							//调用接口 
+							try
+							{
+								result = SAPDataLogic.PostData(url082, postString, "POST");
+							}
+							catch (Exception ex)
+							{
+								resultEntity.Result = -1;
+								resultEntity.Message = "SAP-ZMMFM082接口调用失败，" + ex.Message;
+								return resultEntity;
+							}
+
+
+							//判断物料是否一致
+							if (JObject.Parse(result)["OUT_TABLE"] != null && JObject.Parse(result)["OUT_TABLE"].ToString().Length > 0)
+							{
+								ztype = JObject.Parse(result)["ZTYPE"].ToString();
+								message = JObject.Parse(result)["ZMSG"].ToString();
+								Dictionary<string, object> obj = JsonConvert.DeserializeObject<Dictionary<string, object>>(result);
+
+								object OUT_TABLE;
+								obj.TryGetValue("OUT_TABLE", out OUT_TABLE);
+
+								obj = JsonConvert.DeserializeObject<Dictionary<string, object>>(OUT_TABLE + "");
+								object item1;
+								obj.TryGetValue("item", out item1);
+								JObject jsonObject = JObject.Parse(item1.ToString());
+
+								if (ztype == "S")
+								{
+									//物料编码
+									string matnr = jsonObject["MATNR"].ToString();
+									//未清STO总数
+									decimal zwjsl = Convert.ToDecimal(jsonObject["ZWJSL"].ToString());
+									//未清SO数量
+									decimal zwjso = Convert.ToDecimal(jsonObject["ZWJSO"].ToString());
+									stonum = zwjsl + zwjso;
+
+									if (materialCode == matnr)
+									{
+										//查询本地未同步SAP数量
+										string sqlstr = @"SELECT SUM(OUTPUTNUM) OUTPUTNUM FROM tsap_hegii_workdata_bg WB
+												LEFT JOIN tsap_hegii_datalog_bg D ON WB.LOGID = D.LOGID
+												WHERE D.datacode = '60' And D.DATASTUTS = 'F'
+												AND WB.SAPCODE = '" + materialCode + "' GROUP BY  WB.SAPCODE";
+										DataTable numdata = oracleConn.GetSqlResultToDt(sqlstr, null);
+										//未同步数量
+										decimal unscynnum = 0;
+										if (numdata != null && numdata.Rows.Count > 0)
+										{
+											unscynnum = Convert.ToDecimal(numdata.Rows[0]["OUTPUTNUM"]);
+										}
+										//此次交接一板数量
+
+										decimal bannum = Convert.ToDecimal(dsResult.Tables[0].Rows.Count);
+										decimal allnum = unscynnum + bannum;
+										//判断是否允许交接
+										if (stonum < allnum)
+										{
+											resultEntity.Result = -1;
+											resultEntity.Message = "该板及未同步交接产品物料【"+matnr+"】数量【"+ allnum + "】超出SAP允许出单数量【" + stonum + "】";
+											return resultEntity;
+										}
+									}
+									else
+									{
+										resultEntity.Result = -1;
+										resultEntity.Message = "物料不一致；SAP返回物料【"+ matnr + "】";
+									}  
+								}
+								else
+								{
+
+									resultEntity.Result = -1;
+									resultEntity.Message = message;
+								}
+							}
+							 
+						}
+					}
+
+
+					#endregion
+
 					resultEntity.Result = 1;//成功
 											//resultEntity.Data = new DataSet();
 											//resultEntity.Data.Tables.Add(dsResult.Tables[0].Copy());
@@ -6309,7 +6427,7 @@ and (TP_PM_ProductionDataIn.modeltype <> 5 or (exists (select 1 from tp_pm_grout
 				   "               WHERE rownum = 1";
 
 					paras = new OracleParameter[]{
-						new OracleParameter(":Barcode",OracleDbType.Varchar2, barcode,ParameterDirection.Input),
+						new OracleParameter(":Barcode",OracleDbType.Varchar2, gbarcode,ParameterDirection.Input),
 					};
 					DataTable productionDataIDdt = oracleConn.GetSqlResultToDt(sql, paras);
 					if (productionDataIDdt != null && productionDataIDdt.Rows.Count > 0 && productionDataIDdt.Rows[0]["procedureid"].ToString() != "159")

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -19528,6 +19528,14 @@ ORDER BY
                     parameters.Add(new OracleParameter(":GoodsCode", OracleDbType.NVarchar2, orderEntity.GoodsModel, ParameterDirection.Input));
                 }
 
+                //过滤撤销时间再交接产品
+                if (orderEntity.FhFlag.ToString() == "1")
+				{
+                    sqlString = sqlString + " AND NOT EXISTS(  " +
+                        " SELECT * FROM TP_PM_FINISHEDPRODUCT FP WHERE FP.GROUTINGDAILYDETAILID = GDD.GROUTINGDAILYDETAILID AND FP.FHTIME IS NOT NULL " +
+                        " AND FP.FHTIME BETWEEN  :UndoTimeStart AND :UndoTimeEnd   ) \n";
+
+                }
                 sqlString += " GROUP BY GROUPING SETS((TO_CHAR(F.CREATETIME, 'yyyy-mm-dd'), G.GOODSCODE),\n" +
                              " (TO_CHAR(F.CREATETIME, 'yyyy-mm-dd')),())\n" +
                              " ORDER BY TO_CHAR(F.CREATETIME, 'yyyy-mm-dd'), G.GOODSCODE) TS";
@@ -19620,6 +19628,14 @@ ORDER BY
                     sqlString = sqlString + "  AND INSTR(GOODS.GoodsCode,:GoodsCode) > 0 \n";
                     parameters.Add(new OracleParameter(":GoodsCode", OracleDbType.NVarchar2, orderEntity.GoodsModel, ParameterDirection.Input));
                 }
+                //过滤撤销时间再交接产品
+                if (orderEntity.FhFlag.ToString() == "1")
+                {
+                    sqlString = sqlString + " AND NOT EXISTS(  " +
+                        " SELECT * FROM TP_PM_FINISHEDPRODUCT FP WHERE FP.GROUTINGDAILYDETAILID = GDD.GROUTINGDAILYDETAILID AND FP.FHTIME IS NOT NULL " +
+                        " AND FP.FHTIME BETWEEN  :UndoTimeStart AND :UndoTimeEnd   ) \n";
+
+                }
 
                 ServiceResultEntity sre = new ServiceResultEntity();
                 DataSet result = conn.GetSqlResultToDs(sqlString, parameters.ToArray());

WCF.Service/WCF.DataModels/PMModule/SearchFinishedProductEntity.cs

@@ -366,5 +366,15 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels.PMModule
 			get;
 			set;
 		}
+
+		/// <summary>
+		/// 查询撤销时间内再交接标识
+		/// </summary>
+		[DataMember]
+		public string FhFlag
+		{
+			get;
+			set;
+		}
 	}
 }

WCF.Service/WCF.Hosting/SAP_HEGII.ini

@@ -53,6 +53,7 @@ Url033=http://hgs4podev.hegii.com:50200/RESTAdapter/DKMES/ZPPFM033
 Url034=http://hgs4podev.hegii.com:50200/RESTAdapter/DKMES/ZPPFM034
 Url039=http://hgs4podev.hegii.com:50200/RESTAdapter/DKMES/ZPPFM039
 Url138=http://hgs4podev.hegii.com:50200/RESTAdapter/DKMES/ZSDFM138
+Url082=http://hgs4podev.hegii.com:50200/RESTAdapter/DKMES/ZMMFM082
 UserName=hgsapdk:Sapdk#240
 Factory=5000
 
@@ -62,6 +63,7 @@ Factory=5000
 #Url034=http://hgs4powd1.hegii.com:8000/RESTAdapter/DKMES/ZPPFM034
 #Url039=http://hgs4powd1.hegii.com:8000/RESTAdapter/DKMES/ZPPFM039
 #Url138=http://hgs4powd1.hegii.com:8000/RESTAdapter/DKMES/ZSDFM138
+#Url082=http://hgs4powd1.hegii.com:8000/RESTAdapter/DKMES/ZMMFM082
 #UserName=PODKMES:Sapdk#800
 #Factory=5000
 

WCF.Service/WCF.WebHosting/SAP_HEGII.ini

@@ -62,6 +62,7 @@ Url034=http://hgs4podev.hegii.com:50200/RESTAdapter/DKMES/ZPPFM034
 Url039=http://hgs4podev.hegii.com:50200/RESTAdapter/DKMES/ZPPFM039
 Url138=http://hgs4podev.hegii.com:50200/RESTAdapter/DKMES/ZSDFM138
 Url_BG1001_049 =http://hgs4podev.hegii.com:50200/RESTAdapter/DKMES/ZPPFM049
+Url085=http://hgs4podev.hegii.com:50200/RESTAdapter/DKMES/ZMMFM082
 UserName=hgsapdk:Sapdk#240
 Factory=5000
 
@@ -72,6 +73,7 @@ Factory=5000
 #Url039=http://hgs4podev.hegii.com:8000/RESTAdapter/DKMES/ZPPFM039
 #Url138=http://hgs4podev.hegii.com:8000/RESTAdapter/DKMES/ZSDFM138
 #Url_BG1001_049=http://hgs4powd1.hegii.com:8000/RESTAdapter/DKMES/ZPPFM049
+#Url085=http://hgs4powd1.hegii.com:8000/RESTAdapter/DKMES/ZMMFM082
 #UserName=PODKMES:Sapdk#800
 #Factory=5000