From 2bdad959bc30a7c24bf08ca81fb52fff63e79f52 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 17 二月 2025 21:05:49 +0800
Subject: [PATCH] 优化条码打印功能
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ProductionLineJob/CommonProductionLineJob.cs | 89 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 76 insertions(+), 13 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ProductionLineJob/CommonProductionLineJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ProductionLineJob/CommonProductionLineJob.cs"
index f656c2f..8ff2a35 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ProductionLineJob/CommonProductionLineJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ProductionLineJob/CommonProductionLineJob.cs"
@@ -1,45 +1,108 @@
-锘縰sing AutoMapper;
-using Quartz;
+锘縰sing Quartz;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEAWCS_DTO.WMSInfo;
+using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.Service;
+using WIDESEAWCS_Tasks.ProductionLineJob;
+using WIDESEAWCS_Tasks.StackerCraneJob;
+using static System.Collections.Specialized.BitVector32;
namespace WIDESEAWCS_Tasks
{
[DisallowConcurrentExecution]
- public class CommonProductionLineJob : JobBase, IJob
+ public partial class CommonProductionLineJob : JobBase, IJob
{
private readonly ITaskService _taskService;
private readonly ITaskExecuteDetailService _taskExecuteDetailService;
+ private readonly ITaskRepository _taskRepository;
private readonly IRouterService _routerService;
- private readonly IMapper _mapper;
- public CommonProductionLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper)
+ public CommonProductionLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService)
{
_taskService = taskService;
_taskExecuteDetailService = taskExecuteDetailService;
+ _taskRepository = taskRepository;
_routerService = routerService;
- _mapper = mapper;
}
+ //static int i = 0;
public Task Execute(IJobExecutionContext context)
{
try
{
- CommonConveyorLine conveyorLine = (CommonConveyorLine)context.JobDetail.JobDataMap.Get("JobParams");
- if (conveyorLine != null)
- {
- Console.Out.WriteLine(nameof(CommonProductionLineJob) + ":" + DateTime.Now);
-
- }
+ //if (i < 1)
+ //{
+ // i++;
+ // ProductionLineDTO MaterielGroupDTO = new ProductionLineDTO()
+ // {
+ // stationCode = "MDX01",
+ // traytype = 4,
+ // Barcode = "A0216",
+ // batchNo = "20250113T2",
+ // };
+ // var content = ProductionLineToWMSRequest(MaterielGroupDTO);
+ //}
+ #region MyRegion
+ //OtherDevice ProductionLine = (OtherDevice)context.JobDetail.JobDataMap.Get("JobParams");
+ //if (ProductionLine != null)
+ //{
+ // var request = ProductionLine.GetValue<ProductionLineDBName, short>(ProductionLineDBName.request);
+ // if (request == 1)
+ // {
+ // var traytype = ProductionLine.GetValue<ProductionLineDBName, short>(ProductionLineDBName.trayType);
+ // //var content = Request(ProductionLine, traytype, ProductionLine.DeviceCode);
+ // if (traytype == 4)
+ // {
+ // var Barcode = ProductionLine.GetValue<ProductionLineDBName, string>(ProductionLineDBName.trayBarcode);
+ // var batchNo = ProductionLine.GetValue<ProductionLineDBName, string>(ProductionLineDBName.batchNo);
+ // ProductionLineDTO MaterielGroupDTO = new ProductionLineDTO()
+ // {
+ // stationCode = ProductionLine.DeviceCode,
+ // traytype = traytype,
+ // Barcode = Barcode,
+ // batchNo = batchNo,
+ // };
+ // var content = ProductionLineToWMSRequest(MaterielGroupDTO);
+ // if (content.Status) ProductionLine.SetValue(ProductionLineDBName.Wrequest, 1);
+ // }
+ // }
+ //}
+ #endregion
+ #region MyRegion
+ //short[] shorts = { 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 };
+ //ProductionLineDTO MaterielGroupDTO = new ProductionLineDTO()
+ //{
+ // Barcode = "A1001",
+ // batchNo = "20241212001T1",
+ // stationCode = "Z1",
+ // productQty = string.Join(",", shorts),
+ // traytype = 4
+ //};
+ //ProductionLineToWMSRequest(MaterielGroupDTO);
+ //if (ProductionLine != null)
+ //{
+ // switch (ProductionLine.DeviceName)
+ // {
+ // case "鍏ュ簱浜х嚎":
+ // ProductionLineIn(ProductionLine);
+ // break;
+ // case "鍑哄簱浜х嚎":
+ // ProductionLineOut(ProductionLine);
+ // break;
+ // default:
+ // throw new Exception("鏈畾涔変骇绾�");
+ // }
+ //}
+ #endregion
}
catch (Exception ex)
{
- Console.Out.WriteLine(nameof(CommonConveyorLineJob) + ":" + ex.ToString());
+ Console.Out.WriteLine(nameof(CommonProductionLineJob) + ":" + ex.ToString());
}
return Task.CompletedTask;
}
--
Gitblit v1.9.3