diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config
index 810f3b8..c665cf0 100644
--- a/APP/QMAPP.Web/Web.config
+++ b/APP/QMAPP.Web/Web.config
@@ -42,14 +42,20 @@
+
+
+
+
-
+
diff --git a/APPMD/QMAPP.MD.Web/Web.config b/APPMD/QMAPP.MD.Web/Web.config
index 8c98a17..24b8e5c 100644
--- a/APPMD/QMAPP.MD.Web/Web.config
+++ b/APPMD/QMAPP.MD.Web/Web.config
@@ -33,8 +33,13 @@
+
+
+
+
@@ -105,19 +110,19 @@
-
+ contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />
-
+ contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />-->
diff --git a/APPQ5/QMAPP.FJC.DAL/Basic/MachineInfoDAL.cs b/APPQ5/QMAPP.FJC.DAL/Basic/MachineInfoDAL.cs
index 52ab0f8..e67e745 100644
--- a/APPQ5/QMAPP.FJC.DAL/Basic/MachineInfoDAL.cs
+++ b/APPQ5/QMAPP.FJC.DAL/Basic/MachineInfoDAL.cs
@@ -291,7 +291,8 @@ namespace QMAPP.FJC.DAL.Basic
//设备编号
if (string.IsNullOrEmpty(condition.MACHINECODDE) == false)
{
- whereBuilder.Append(" AND MACHINECODDE LIKE '%'+" + "@MACHINECODDE" + "+'%'");
+ //whereBuilder.Append(" AND MACHINECODDE LIKE '%'+" + "@MACHINECODDE" + "+'%'");
+ whereBuilder.Append(" AND MACHINECODDE = @MACHINECODDE");
parameters.Add(new DataParameter { ParameterName = "MACHINECODDE", DataType = DbType.String, Value = condition.MACHINECODDE });
}
diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs
index ca7300b..67cb654 100644
--- a/APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs
+++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs
@@ -401,7 +401,7 @@ namespace QMAPP.FJC.DAL.TianJin
break;
}
}
- sql.AppendFormat(" ORDER BY W.[UPDATEDATE],W.[PRI],W.[PLAN_DATE],P.PLAN_SEQ,W.[SEQ],W.[MATERIAL_CODE] ");
+ sql.AppendFormat(" ORDER BY W.[UPDATEDATE],W.[PRI],W.[PLAN_DATE],W.[ORDERPLAN_NO],P.PLAN_SEQ,W.[SEQ],W.[MATERIAL_CODE] ");
List parameters = new List();
parameters.Add(new DataParameter("routecode", routecode));
using (var session = AppDataFactory.CreateMainSession())
diff --git a/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs b/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs
index e1ed9c3..c3e45a5 100644
--- a/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs
+++ b/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs
@@ -380,7 +380,7 @@ namespace QMAPP.FJC.Web.Controllers
{
dt = this.GetTableByExcel("DoorPlankPlanImp", fileName, dt);
//格式转换
- list = QMFrameWork.Common.Util.BindHelper.ConvertToList(dt).ToList();
+ list = QMFrameWork.Common.Util.BindHelper.ConvertToList(dt).OrderBy(w => w.PLAN_NO).ToList();
serviceResult = wcfAgent.InvokeServiceFunction>("DoorPlankPlanBLL_GetImportData", list, materialmodel,machine, produceshiftmodel, workcell);
if (serviceResult.Ex != null)
{
diff --git a/APPQ5/QMAPP.FJC.Web/Temp/68b954f7-cfc6-4e67-afc9-df7840250b0d.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/68b954f7-cfc6-4e67-afc9-df7840250b0d.xlsx
new file mode 100644
index 0000000..dda7939
Binary files /dev/null and b/APPQ5/QMAPP.FJC.Web/Temp/68b954f7-cfc6-4e67-afc9-df7840250b0d.xlsx differ
diff --git a/APPQ5/QMAPP.FJC.Web/Temp/cd1538b0-f827-4ac7-9111-d27a5c0407be.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/cd1538b0-f827-4ac7-9111-d27a5c0407be.xlsx
new file mode 100644
index 0000000..dda7939
Binary files /dev/null and b/APPQ5/QMAPP.FJC.Web/Temp/cd1538b0-f827-4ac7-9111-d27a5c0407be.xlsx differ
diff --git a/APPQ5/QMAPP.FJC.Web/Temp/de760407-2172-474d-8517-8a715069e144.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/de760407-2172-474d-8517-8a715069e144.xlsx
new file mode 100644
index 0000000..e5fd266
Binary files /dev/null and b/APPQ5/QMAPP.FJC.Web/Temp/de760407-2172-474d-8517-8a715069e144.xlsx differ
diff --git a/APPQ5/QMAPP.FJC.Web/Temp/e6609924-9e68-4d29-8dda-fd4beff0c1b4.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/e6609924-9e68-4d29-8dda-fd4beff0c1b4.xlsx
new file mode 100644
index 0000000..94c0f70
Binary files /dev/null and b/APPQ5/QMAPP.FJC.Web/Temp/e6609924-9e68-4d29-8dda-fd4beff0c1b4.xlsx differ
diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config
index 41fdfbb..6d0a56a 100644
--- a/APPQ5/QMAPP.FJC.Web/Web.config
+++ b/APPQ5/QMAPP.FJC.Web/Web.config
@@ -33,6 +33,11 @@
+
+
@@ -43,7 +48,7 @@
-
+
diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config
index cd3b02e..5984160 100644
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@@ -13,10 +13,15 @@
-
+
+
+
+
+
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
index e025ba1..c86f8c3 100644
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
@@ -1401,15 +1401,15 @@ namespace QMAPP.WinForm.Forms.TianJin
vinNumber = Convert.ToInt32(dgvMATChange.Rows[scanSum].Cells["REQUESTID"].Value.ToString());
}
- if ((vinNumber - lastvinNumber) > 1)
- {
- var dresult = MessageBox.Show("出现顺序号间隔,是否继续发货?", "提示", MessageBoxButtons.YesNo);
- if (dresult == DialogResult.No)
- {
- ArragetxtCode();
- return;
- }
- }
+ //if ((vinNumber - lastvinNumber) > 1)
+ //{
+ // var dresult = MessageBox.Show("出现顺序号间隔,是否继续发货?", "提示", MessageBoxButtons.YesNo);
+ // if (dresult == DialogResult.No)
+ // {
+ // ArragetxtCode();
+ // return;
+ // }
+ //}
#endregion
diff --git a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs
index 5809179..99966a9 100644
--- a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs
+++ b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2022.08.17.01")]
-[assembly: AssemblyFileVersion("2022.08.17.01")]
+[assembly: AssemblyVersion("2022.09.01.01")]
+[assembly: AssemblyFileVersion("2022.09.01.01")]
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index 5560056..c785078 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -73,7 +73,13 @@
-
+
+
+
+