红旗新车型FIS系统升级-开发前优化提交

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs

@@ -784,8 +784,9 @@ namespace WY.NewJit.PrintTable
             {
                 PagedResultDto<WaitPrintDto> ret = new PagedResultDto<WaitPrintDto>();
                 if (input.BusinessType == BusinessTypeEnum.MenBan 
-                    || input.BusinessType == BusinessTypeEnum.OtherZhuHuBan 
+                    //|| input.BusinessType == BusinessTypeEnum.OtherZhuHuBan 
-                    || input.BusinessType == BusinessTypeEnum.AC_ZhuHuBan)
+                    //|| input.BusinessType == BusinessTypeEnum.AC_ZhuHuBan
+                    )
                 {
                     ret = await QueryByConditionAsync(input, (PagedAndSortedBase)input);
 
@@ -1263,8 +1264,9 @@ namespace WY.NewJit.PrintTable
                 PagedResultDto<WaitPrintDto> query = new PagedResultDto<WaitPrintDto>();
                 
                 if (input.BusinessType == BusinessTypeEnum.MenBan
-                    || input.BusinessType == BusinessTypeEnum.OtherZhuHuBan
+                    //|| input.BusinessType == BusinessTypeEnum.OtherZhuHuBan
-                    || input.BusinessType == BusinessTypeEnum.AC_ZhuHuBan)
+                    //|| input.BusinessType == BusinessTypeEnum.AC_ZhuHuBan
+                    )
                 {
                     input.MaxResultCount = 50000;
                     query = await QueryByConditionAsync(input, (PagedAndSortedBase)input);

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService_ZHB.cs

@@ -778,14 +778,14 @@ namespace WY.NewJit.PrintTable
 
         private static BusinessTypeEnum GetBusinessType(string groupName)
         {
-            BusinessTypeEnum busiType;
+            BusinessTypeEnum busiType = BusinessTypeEnum.MenBan;
             if (groupName == "2")
             {
-                busiType = BusinessTypeEnum.OtherZhuHuBan;
+                //busiType = BusinessTypeEnum.OtherZhuHuBan;
             }
             else if (groupName == "3")
             {
-                busiType = BusinessTypeEnum.AC_ZhuHuBan;
+                //busiType = BusinessTypeEnum.AC_ZhuHuBan;
             }
             else
             {

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain.Shared/PrintTable/BusinessTypeEnum.cs

@@ -13,11 +13,11 @@ namespace WY.NewJit.PrintTable
         [Description("门板")]
         MenBan = 1,
 
-        [Description("其它柱护板")]
+        //[Description("其它柱护板")]
-        OtherZhuHuBan = 2,
+        //OtherZhuHuBan = 2,
 
-        [Description("AC柱护板")]
+        //[Description("AC柱护板")]
-        AC_ZhuHuBan = 3,
+        //AC_ZhuHuBan = 3,
 
 
     }

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/EdiReceive/Services/HQ_M100DomainService.cs

@@ -170,7 +170,7 @@ namespace WY.NewJit.MsgCheck
         }
 
         /// <summary>
-        /// 根据M100插入或更新未打印表，【未知总成重新解析时调用】
+        /// 根据M100插入或更新未打印表，【未知总成重新解析时调用】；有则更新，没有则插入
         /// </summary>
         /// <param name="m100Obj"></param>
         /// <returns></returns>

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Web/appsettings.json

@@ -11,9 +11,11 @@
     //"Default": "Server=192.168.0.140;Database=ABP;User ID=sa;Password=Microsoft2008;",
     //"WMS": "Server=192.168.0.140;Database=CPAT_WMS_TEST;User ID=sa;Password=Microsoft2008;"
 
-    "Default": "Server=dev.ccwin-in.com,6208;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
+    //"Default": "Server=dev.ccwin-in.com,6208;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
-    "NewJitPG": "Server=dev.ccwin-in.com,6208;Database=NewJitPG_HQ;uid=sa;pwd=ChangkeTec@2021;",
+    //"NewJitPG": "Server=dev.ccwin-in.com,6208;Database=NewJitPG_HQ;uid=sa;pwd=ChangkeTec@2021;",
-    "WMS": "Server=dev.ccwin-in.com,6208;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;"
+    "WMS": "Server=dev.ccwin-in.com,6208;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;",
+    "Default": "server=WenYin618\\MyServer;Database=ABP;uid=sa;pwd=1;Encrypt=True;TrustServerCertificate=True",
+    "NewJitPG": "server=WenYin618\\MyServer;Database=NewJitPG_HQ;uid=sa;pwd=1;Encrypt=True;TrustServerCertificate=True"
     //"NewJitPG": "Server=192.168.0.68;Database=NewJitPG_HQ;uid=sa;pwd=Microsoft@2022;",
     //"WMS": "Server=192.168.0.140;Database=CPAT_WMS_TEST;User ID=sa;Password=Microsoft2008;"
   },