改测试bug

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

@@ -146,7 +146,7 @@ namespace WY.NewJit.PrintTable
         /// </summary>
         [ExporterHeader(DisplayName = "R100上线时间")]
         [ImporterHeader(Name = "R100上线时间")]
-        public DateTime R100OnlineTime { get; set; }
+        public DateTime? R100OnlineTime { get; set; }
 
         /// <summary>
         /// R100接收时间

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

@@ -110,6 +110,8 @@ namespace WY.NewJit.PrintTable
 
         private readonly M100DomainService _m100DomainService;
 
+        private readonly IRepository<BillR100, Guid> _billR100Repository;
+
         /// <summary>
         /// BLOB存储
         /// </summary>
@@ -133,8 +135,8 @@ namespace WY.NewJit.PrintTable
             IRepository<ZhuHuBanPackingList, Guid> zhuHuBanPackingListRepository,
             IRepository<PrintTemplateConfiguration, Guid> printTemplateConfigurationRepository,
             M100DomainService m100DomainService,
-            IBlobContainer<OurFileContainer> blobContainer
+            IBlobContainer<OurFileContainer> blobContainer,
-
+            IRepository<BillR100, Guid> billR100Repository
             )
         {
             _waitPrintRepository = waitPrintRepository;
@@ -154,6 +156,7 @@ namespace WY.NewJit.PrintTable
             _printTemplateConfigurationRepository = printTemplateConfigurationRepository;
             _m100DomainService = m100DomainService;
             _blobContainer = blobContainer;
+            _billR100Repository = billR100Repository;
         }
 
         #region 私有方法
@@ -782,6 +785,20 @@ namespace WY.NewJit.PrintTable
                     || input.BusinessType == BusinessTypeEnum.AC_ZhuHuBan)
                 {
                     ret = await QueryByConditionAsync(input, (PagedAndSortedBase)input);
+
+                    var knrLst = ret.Items.Select(itm => itm.KNR).ToList();
+
+                    List<BillR100> r100Lst = await _billR100Repository.Where(itm => knrLst.Contains(itm.KNR)).ToListAsync();
+                    //List<BillR100> r100Lst = await _billR100Repository.GetListAsync(itm => knrLst.Contains(itm.KNR));
+                    foreach (var waitPrintItem in ret.Items)
+                    {
+                        BillR100 r100Obj = r100Lst.FirstOrDefault(itm => itm.KNR == waitPrintItem.KNR);
+                        if (r100Obj != null)
+                        {
+                            waitPrintItem.R100OnlineTime = r100Obj.OnlineTime;
+                            waitPrintItem.R100ReceiveTime = r100Obj.ReceiveTime;
+                        }
+                    }
                 }
                 //else if (input.BusinessType == BusinessTypeEnum.OtherZhuHuBan || input.BusinessType == BusinessTypeEnum.ZhuHuBan)
                 //{

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

@@ -19,9 +19,13 @@
     //"Default": "Server=192.168.0.140;Database=NewJitPG_TEST_20230703;uid=sa;pwd=Microsoft2008;",
     //"ABP": "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=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;",
+    //"Default": "Server=dev.ccwin-in.com,6208;Database=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;",
-    "ABP": "Server=dev.ccwin-in.com,6208;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
+    //"ABP": "Server=dev.ccwin-in.com,6208;Database=ABP;User ID=sa;Password=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=192.168.0.228;Database=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;",
+    "ABP": "Server=192.168.0.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
+    "WMS": "Server=192.168.0.228;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;"
+
   },
 
 

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

@@ -37,9 +37,13 @@
     //"Default": "Server=192.168.0.140;Database=NewJitPG_TEST_20230703;uid=sa;pwd=Microsoft2008;",
     //"ABP": "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=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;",
+    //"Default": "Server=dev.ccwin-in.com,6208;Database=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;",
-    "ABP": "Server=dev.ccwin-in.com,6208;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
+    //"ABP": "Server=dev.ccwin-in.com,6208;Database=ABP;User ID=sa;Password=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=192.168.0.228;Database=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;",
+    "ABP": "Server=192.168.0.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
+    "WMS": "Server=192.168.0.228;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;"
+
   },
 
   "AuthServer": {

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

@@ -17,9 +17,13 @@
     //"Default": "Server=192.168.0.140;Database=NewJitPG_TEST_20230703;uid=sa;pwd=Microsoft2008;",
     //"ABP": "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=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;",
+    //"Default": "Server=dev.ccwin-in.com,6208;Database=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;",
-    "ABP": "Server=dev.ccwin-in.com,6208;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
+    //"ABP": "Server=dev.ccwin-in.com,6208;Database=ABP;User ID=sa;Password=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=192.168.0.228;Database=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;",
+    "ABP": "Server=192.168.0.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
+    "WMS": "Server=192.168.0.228;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;"
+
   },
 
 

vue/src/router/index.js

@@ -64,10 +64,10 @@ export const constantRoutes = [
   },
   {
     path: '/login',
-    component: () => import('@/views/login/index'),
+    //component: () => import('@/views/login/index'),
-	//component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one
+	  //component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one
-	//component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one
+	  //component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one
-	//component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
+	  component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
     hidden: true
   },
   {

vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue

@@ -369,6 +369,7 @@
                   size="small"
                   style="width: 240px"
                   @change="beginHostSNChange"
+									:disabled="true"
                 />
                 <label class="label1">-</label>
                 <el-input
@@ -1097,7 +1098,7 @@ export default {
     /** 格式化字段 */
     fieldFormatter(row, column) {
       if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
+        return { 1: "未解析", 2: "已解析", 3: "已打印", 4: "断号" }[row[column.property]];
       }
       if (column.property === "zHBBillStatus") {
         return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];

vue/static/config.js

@@ -36,10 +36,10 @@ if (process.env.NODE_ENV === "development") {
   configJSON = {
     base: {
       //ip: "http://192.168.0.140",
-			ip: "http://192.168.0.228",
       // auth_port: "8066",
       // public_port: "8092",
       // backend_port: "8092",
+			ip: "http://222.169.228.163",
       auth_port: "7696",
       public_port: "7692",
       backend_port: "7692",