liulb@mesnac.com 11 months ago
parent 88c9277638
commit 8c75708620

@ -491,6 +491,76 @@
是否已下达计划0-是1-否)
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.BaseTeamMembers">
<summary>
班组信息
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.BaseTeamMembers.ObjId">
<summary>
主键标识
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.BaseTeamMembers.TeamCode">
<summary>
班组编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.BaseTeamMembers.TeamName">
<summary>
班组名称
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.BaseTeamMembers.TeamHead">
<summary>
班组负责人
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.BaseTeamMembers.ProductLineCode">
<summary>
所属产线/工位
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.BaseTeamMembers.IsFlag">
<summary>
是否标识
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.BaseTeamMembers.CreatedBy">
<summary>
创建人
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.BaseTeamMembers.CreatedTime">
<summary>
创建时间
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.BaseTeamMembers.UpdatedBy">
<summary>
更新人
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.BaseTeamMembers.UpdatedTime">
<summary>
更新时间
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.BaseTeamMembers.StartTime">
<summary>
开始时间
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.BaseTeamMembers.EndTime">
<summary>
结束时间
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.BaseTeamMembers.DingTime">
<summary>
吃饭时间
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.BaseTest.result">
<summary>
接收从条码系统获取的校验字符串
@ -6226,6 +6296,11 @@
创建时间
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.BeginDate">
<summary>
订单开始时间
</summary>
</member>
<member name="T:Admin.Core.Model.ViewModels.ProductAllModel">
<summary>
分舵获取成品下线所有类型
@ -6321,11 +6396,6 @@
返修措施
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.QualityView.ProcessResult">
<summary>
返修结果
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.QualityView.GroupCode">
<summary>
检验班组
@ -6346,21 +6416,6 @@
工位编码
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.QualityView.ReworkNumber">
<summary>
返工编码
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.QualityView.FinishTime">
<summary>
完成时间
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.QualityView.IsFlag">
<summary>
完成标识
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.QualityView.UpdateTime">
<summary>
完成时间

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+70418500de012847aaf9a0c60e06e6b4718093b7")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
fcc46a057f74d4423aec30334d3ddd5e97836b3d033f03b2c5595ccb518c54d1
710cc7789d792a7b8161878623ee988ba7cb8242bc99df7e3be1fe877fdd0cc0

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+70418500de012847aaf9a0c60e06e6b4718093b7")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
db0ec7b97f8779665e1ec08cc714382e10cfd45db264244ce5d0133feee1686e
d98cc14f8bd822d72d804b2554f56ec60713f4f4561d2fbbf5e5e0b21d74633a

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+70418500de012847aaf9a0c60e06e6b4718093b7")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
afc6469c2cf36aee15a6f573d13a18a2a3bc6651c31f1b0e56a41ef757faf3fc
8a9f89bda8e5afd54106e50f45b822b221777b6a2a2d8effbc99c95f74a3d66e

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+70418500de012847aaf9a0c60e06e6b4718093b7")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
498bcbd8bc47ba72111fad9a44918162edd56a33e0dd90e98dc3393bcc551bc9
88206fa803182f9a1db66b51ed570f797407da9eb9156f545e8a48f7790eafa8

@ -0,0 +1,13 @@
using Admin.Core.Model.Model_New;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Admin.Core.IRepository.IRepository_New
{
public interface IBaseTeamMembersRepository : IBaseRepository<BaseTeamMembers>
{
}
}

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+70418500de012847aaf9a0c60e06e6b4718093b7")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
29ef1467794079bbd76fd0bae6e8c42700c15a70abd6b0da13de940a0e65c91c
f98e4b67bad7fcc3b681493fdef3ee63574c10b03944d9084c9aee617b67a371

@ -0,0 +1,17 @@
using Admin.Core.IService;
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
using Admin.Core.Model.ViewModels;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace Admin.Core.IService
{
/// <summary>
/// IBaseBomInfoServices
/// </summary>
public interface IBaseTeamMembersServices : IBaseServices<BaseTeamMembers>
{
}
}

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+70418500de012847aaf9a0c60e06e6b4718093b7")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
ea5d693d67f16b80f472915c7421f247c159f2a887da000d8ed99161bf3e9660
40b85944d2b7cb9c168e58ea550c96df1adc14326092bea67d27965860a6fcdc

@ -0,0 +1,92 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Admin.Core.Model.Model_New
{
/// <summary>
/// 班组信息
/// </summary>
[SugarTable("BASE_TEAMMEMBERS", "AUCMA_MES")]
public class BaseTeamMembers
{
/// <summary>
/// 主键标识
///</summary>
[SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true, IsIdentity = true)]
public int ObjId { get; set; }
/// <summary>
/// 班组编号
/// </summary>
[SugarColumn(ColumnName = "TEAM_CODE")]
public string TeamCode { get; set; }
/// <summary>
/// 班组名称
/// </summary>
[SugarColumn(ColumnName = "TEAM_NAME")]
public string TeamName { get; set; }
/// <summary>
/// 班组负责人
/// </summary>
[SugarColumn(ColumnName = "TEAM_HEAD")]
public string TeamHead { get; set; }
/// <summary>
/// 所属产线/工位
/// </summary>
[SugarColumn(ColumnName = "PRODUCT_LINE_CODE")]
public string ProductLineCode { get; set; }
/// <summary>
/// 是否标识
/// </summary>
[SugarColumn(ColumnName = "IS_FLAG")]
public int IsFlag { get; set; }
/// <summary>
/// 创建人
/// </summary>
[SugarColumn(ColumnName = "CREATED_BY")]
public string CreatedBy { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[SugarColumn(ColumnName = "CREATED_TIME")]
public string CreatedTime { get; set; }
/// <summary>
/// 更新人
/// </summary>
[SugarColumn(ColumnName = "UPDATED_BY")]
public string UpdatedBy { get; set; }
/// <summary>
/// 更新时间
/// </summary>
[SugarColumn(ColumnName = "UPDATED_TIME")]
public string UpdatedTime { get; set; }
/// <summary>
/// 开始时间
/// </summary>
[SugarColumn(ColumnName = "START_TIME")]
public string StartTime { get; set; }
/// <summary>
/// 结束时间
/// </summary>
[SugarColumn(ColumnName = "END_TIME")]
public string EndTime { get; set; }
/// <summary>
/// 吃饭时间
/// </summary>
[SugarColumn(ColumnName = "DINE_TIME")]
public string DingTime { get; set; }
}
}

@ -79,5 +79,10 @@ namespace Admin.Core.Model.ViewModels
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 订单开始时间
/// </summary>
public DateTime BeginDate { get; set; }
}
}

@ -55,8 +55,8 @@ namespace Admin.Core.Model.ViewModels
/// <summary>
/// 返修结果
/// </summary>
[SugarColumn(ColumnName = "PROCESS_RESULT")]
public string ProcessResult { get; set; }
//[SugarColumn(ColumnName = "PROCESS_RESULT")]
//public string ProcessResult { get; set; }
/// <summary>
/// 检验班组
/// </summary>
@ -76,22 +76,22 @@ namespace Admin.Core.Model.ViewModels
/// 工位编码
/// </summary>
[SugarColumn(ColumnName = "STATION_CODE")]
public string StationCode { get; set; }
public string? StationCode { get; set; }
/// <summary>
/// 返工编码
/// </summary>
[SugarColumn(ColumnName = "REWORK_NUMBER")]
public int ReworkNumber { get; set; }
//[SugarColumn(ColumnName = "REWORK_NUMBER")]
//public int ReworkNumber { get; set; }
/// <summary>
/// 完成时间
/// </summary>
[SugarColumn(ColumnName = "FINISH_TIME")]
public DateTime FinishTime { get; set; }
//[SugarColumn(ColumnName = "FINISH_TIME")]
//public DateTime? FinishTime { get; set; }
/// <summary>
/// 完成标识
/// </summary>
[SugarColumn(ColumnName = "IS_FLAG")]
public int IsFlag { get; set; }
//[SugarColumn(ColumnName = "IS_FLAG")]
//public int IsFlag { get; set; }
/// <summary>
/// 完成时间
/// </summary>

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+70418500de012847aaf9a0c60e06e6b4718093b7")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
72c9e287ad91d51e5aace170d0e7fe6ab88a43a94b1dd2293e14899745eb0c73
cbfeb6f99c47ecc0d95bd63de9f865bb8070a09233dde051c5116b32ef7bd248

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+70418500de012847aaf9a0c60e06e6b4718093b7")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
5143821d938a2fda9c50266408abc0e24feaedff2f8e64382cbf8979b61e232b
5c415a7f642151a4538f09537b0a7e4396e646b552652f9fa1cf5bc49761ab3b

@ -20,7 +20,8 @@ namespace Admin.Core.Repository
{
string sql = @$" select DISTINCT o.* from (
select r.* from (select r.*,BP.PRODUCT_LINE_NAME from BASE_ORDERINFO r LEFT JOIN BASE_PRODUCTLINE BP on r.WORK_CENTER_CODE = BP.WORK_CENTER_CODE) r
left join BASE_MATERIALINFO m on r.MATERIAL_CODE=m.MATERIAL_CODE where MATERIAL_SUBCLASS='100') o left join BASE_BOMINFO b on o.MATERIAL_CODE=b.PARENT_ID WHERE SUBSTR(o.ORDER_STATUS, 0, 4)!='CLSD'
left join BASE_MATERIALINFO m on r.MATERIAL_CODE=m.MATERIAL_CODE where MATERIAL_SUBCLASS='100') o left join BASE_BOMINFO b on o.MATERIAL_CODE=b.PARENT_ID
WHERE SUBSTR(o.ORDER_STATUS, 0, 4)!='CLSD' and SUBSTR(o.ORDER_STATUS, 0, 4)!='TECO' and PRODUCT_LINE_NAME!='线'
";
return await Db.CopyNew().Ado.SqlQueryAsync<BaseOrderInfoView>(sql);
}

@ -0,0 +1,17 @@
using Admin.Core.IRepository;
using Admin.Core.IRepository.IRepository_New;
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
namespace Admin.Core.Repository
{
/// <summary>
/// BaseBomInfoRepository
/// </summary>
public class BaseTeamMembersRepository : BaseRepository<BaseTeamMembers>, IBaseTeamMembersRepository
{
public BaseTeamMembersRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
{
}
}
}

@ -19,28 +19,26 @@ namespace Admin.Core.Repository
public async Task<List<QualityView>> GetAllIsFlag(int objId)
{
string sql = @$"SELECT TH.OBJ_ID, TH.CPNO BAR_CODE,
ML.MATERIAL_NAME,
PS.PROCESS_CODE PROCESS_CODE,
CASE WHEN TH.CPRESULT = 'OK' THEN NULL ELSE '2009' END TEST_ITEM_CODE,
QI.QUALITY_DEFECT_CODE,
QI.QUALITY_DEFECT_NAME,
CASE WHEN TH.CPRESULT = 'OK' THEN '3' ELSE '1' END TREATMENT_MEASURE,
CASE WHEN TH.CPRESULT = 'OK' THEN NULL ELSE '' END PROCESS_RESULT,
'ZLJY-01' GROUP_CODE,
'cwjy02' INSPECTOR_CODE,
TH.ENDDATETIME INSPECTOR_TIME,
'2009' STATION_CODE,
CASE WHEN TH.CPRESULT = 'OK' THEN 0 ELSE 1 END REWORK_NUMBER,
CASE WHEN TH.CPRESULT = 'OK' THEN NULL ELSE TH.ENDDATETIME END FINISH_TIME,
1 IS_FLAG,
SYSDATE UPDATED_TIME
FROM BOX_TEMPERATUREHISTORY TH
JOIN PRINT_BARCODE PB ON PB.MATERIAL_BARCODE = TH.CPNO
JOIN C##AUCMA_MES.BASE_MATERIALINFO ML ON PB.MATERIAL_CODE = ML.MATERIAL_CODE
JOIN C##AUCMA_MES.BASE_PROCESS_STATION PS ON PROCESS_TYPE = 2 AND PS.PARENT_ID LIKE '%2009%'
LEFT JOIN C##AUCMA_MES.BASE_QUALITY_INSPECTION_ITEM QI ON QI.QUALITY_DEFECT_NAME = TH.CPRESULT
WHERE TH.OBJ_ID = {objId}";
string sql = @$"SELECT TH.OBJ_ID,
TH.CPNO BAR_CODE,
ML.MATERIAL_NAME,
PS.PROCESS_CODE PROCESS_CODE,
CASE WHEN TH.CPRESULT = 'OK' THEN NULL ELSE '2009' END TEST_ITEM_CODE,
QI.QUALITY_DEFECT_CODE,
QI.QUALITY_DEFECT_NAME,
CASE WHEN TH.CPRESULT = 'OK' THEN '3' ELSE '1' END TREATMENT_MEASURE,
'ZLJY-01' GROUP_CODE,
'cwjy02' INSPECTOR_CODE,
TH.ENDDATETIME INSPECTOR_TIME,
'2009' STATION_CODE,
SYSDATE UPDATED_TIME
FROM BOX_TEMPERATUREHISTORY TH
JOIN PRINT_BARCODE PB ON PB.MATERIAL_BARCODE = TH.CPNO
JOIN C##AUCMA_MES.BASE_MATERIALINFO ML ON PB.MATERIAL_CODE = ML.MATERIAL_CODE
JOIN C##AUCMA_MES.BASE_PROCESS_STATION PS ON PROCESS_TYPE = 2 AND PS.PARENT_ID LIKE '%2009%'
LEFT JOIN C##AUCMA_MES.BASE_QUALITY_INSPECTION_ITEM QI ON QI.QUALITY_DEFECT_NAME = TH.CPRESULT
WHERE TH.OBJ_ID = {objId}";
return await Db.CopyNew().Ado.SqlQueryAsync<QualityView>(sql);
}

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+70418500de012847aaf9a0c60e06e6b4718093b7")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
8e6cb460b9342722b005c4abba5c9c4d0eabc6f3312fccb92b2347e8fec5d042
eb5fd61de5afc4a32fb59408f414f145351b7b3d825b7b468cc2d281d502195e

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+70418500de012847aaf9a0c60e06e6b4718093b7")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
04a64d20793f571022f15e71c7a9da81adbb18f732243ae7a8ca468ef044b347
3eb24d15e33e21def9c2c9dc2fe26b0702ddabb2012159abbededb38ec9baf2b

@ -83,6 +83,7 @@ namespace Admin.Core.Service
view.ProductCode = bb.MaterialCode;
view.ProductName = bb.MaterialName;
view.PlanAmount = bb.OrderAmount;
view.CompleteAmount = bb.CompleteAmount;
//view.MaterialCode = bomInfo.MaterialCode;
//view.MaterialName = bomInfo.MaterialName;
//view.LinerAmount = bomInfo.StandardAmount;
@ -105,7 +106,7 @@ namespace Admin.Core.Service
//view.StandardAmount = bomInfo.StandardAmount;
view.PrintName = bb.PrintName;
view.CreateTime = bb.CreatedTime;
view.BeginDate = bb.BeginDate;
list.Add(view);
// }
// tmpList.Clear();

@ -0,0 +1,32 @@
using Admin.Core.IRepository;
using Admin.Core.IRepository.IRepository_New;
using Admin.Core.IService;
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
using Admin.Core.Model.ViewModels;
using log4net;
using Microsoft.AspNetCore.Razor.TagHelpers;
using Microsoft.IdentityModel.Logging;
using NPOI.XSSF.UserModel;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Admin.Core.Service
{
public class BaseTeamMembersServices : BaseServices<BaseTeamMembers>, IBaseTeamMembersServices
{
private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(BaseTeamMembersServices));
private readonly IBaseRepository<BaseTeamMembers> _dal;
private readonly IBaseTeamMembersRepository _baseTeamMembersRepository;
public BaseTeamMembersServices(IBaseRepository<BaseTeamMembers> dal, IBaseTeamMembersRepository baseTeamMembersRepository)
{
this._dal = dal;
base.BaseDal = dal;
_baseTeamMembersRepository = baseTeamMembersRepository;
}
}
}

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+70418500de012847aaf9a0c60e06e6b4718093b7")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
44d794f0c0f6a3a0dd1c040f610c799dd1499bb06c18e0f51f48136d68feeaf9
20586157a686248d32803e650cca9c7ada3f134ed0f97e5785f80cb2649b79b3

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+70418500de012847aaf9a0c60e06e6b4718093b7")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
50c9207d2a9cf6f934c65d914bed76058be2c858f76b32058690f13b362356f4
5c1503dedb89991bd2182e1bc2b145043b968cf956d02765367b1c3b30262afd

@ -238,7 +238,7 @@
}
],
"StoreInfo": {
"StationCode": "1004", //
"StationCode": "1004",
"ShellInventoryStoreCode": "XKK-001",
"LinerInventory": "NDK-001",
"AfterStoreCode": "PHK-001",
@ -246,7 +246,7 @@
"ProductlineCode": "CX_02"
},
"StationInfo": {
"StationCode": "1005"//
"StationCode": "1005"
},
"IpRateLimiting": {
"EnableEndpointRateLimiting": false, //False: globally executed, true: executed for each

@ -25,7 +25,7 @@ namespace Aucma.Core.PrintTo
var host = CreateHostBuilder(e.Args).Build();//生成宿主。
ServiceProvider = host.Services;
host.Services.GetRequiredService<LoginPageView>()?.Show();
host.Services.GetRequiredService<MainWindow>()?.Show();
await host.StartAsync();
}

@ -16,6 +16,11 @@ namespace Aucma.Core.PrintTo.Models
/// 订单日期
/// </summary>
public DateTime CreatedTime { get; set; }
/// <summary>
/// 订单开始
/// </summary>
public DateTime BeginDate { get; set; }
/// <summary>
/// 产线
/// </summary>

@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Aucma.Core.PrintTo.Models
{
/**
*
* */
public class Result
{
/// <summary>
/// 返回结果
/// </summary>
public string msg { get; set; }
/// <summary>
/// 返回状态
/// </summary>
public int code { get; set; }
/// <summary>
/// 返回令牌
/// </summary>
public string token { get; set; }
}
}

@ -17,7 +17,7 @@ using System.Linq;
using System.Threading.Tasks;
using System.Windows;
/*
/**
*
*
*/
@ -29,6 +29,7 @@ namespace Aucma.Core.PrintTo.ViewModels
protected readonly IBaseOrderInfoServices _baseOrderInfoServices;
protected readonly IPrintBarCodeServices _printBarCodeServices;
List<BaseBomInfo> treeNodes =new List<BaseBomInfo>();
/// <summary>
/// 打印类型
/// </summary>
@ -40,6 +41,7 @@ namespace Aucma.Core.PrintTo.ViewModels
_printBarCodeServices = App.ServiceProvider.GetService<IPrintBarCodeServices>();
PrintIsEnabled = "True";
AppendPrintEnabled = "False";
WeakReferenceMessenger.Default.Register<string>(this, Recive);
PrintAmount = 0;
LoadData();
@ -55,12 +57,12 @@ namespace Aucma.Core.PrintTo.ViewModels
if (list == null) return;
list= list.Where(d=>d.PlanAmount>d.CompleteAmount).ToList();
if (list == null) return;
list = list.OrderBy(d => d.CreateTime).ToList();
list = list.OrderByDescending(d => d.BeginDate).ToList();
var printBarCode = await _printBarCodeServices.QueryAsync();
foreach (var item in list)
{
OrderInfo order = new OrderInfo();
order.CreatedTime = item.CreateTime;
order.BeginDate = item.BeginDate;
order.ProductLineName = item.ProductLineName;
order.OrderCode = item.OrderCode;
order.ProductCode = item.ProductCode;
@ -76,6 +78,7 @@ namespace Aucma.Core.PrintTo.ViewModels
order.LinerCodeNum = item.LinerAmount;
order.BoxCodeNum = item.BoxAmount;
order.PrintName = item.PrintName;
order.CompleteAmount = item.CompleteAmount;
datalist.Add(order);
}
}
@ -93,7 +96,7 @@ namespace Aucma.Core.PrintTo.ViewModels
foreach (var item in pintList)
{
OrderInfo order = new OrderInfo();
order.CreatedTime = item.CreateTime;
order.BeginDate = item.BeginDate;
order.OrderCode = item.OrderCode;
order.ProductCode = item.ProductCode;
order.ProductName = item.ProductName;
@ -145,6 +148,17 @@ namespace Aucma.Core.PrintTo.ViewModels
#endregion
#region radio按产线查询按钮
/// <summary>
/// 查询
/// </summary>
[RelayCommand]
private void ProductRadioQuery(string productOne)
{
}
#endregion
#region radio查询按钮
/// <summary>
/// 查询
@ -358,7 +372,20 @@ namespace Aucma.Core.PrintTo.ViewModels
printAmount = value;
SetProperty(ref printAmount, value);
}
}
}
#endregion
#region 是否启用追打按钮
private string appendPrintEnabled;
public string AppendPrintEnabled
{
get { return appendPrintEnabled; }
set
{
appendPrintEnabled = value;
SetProperty(ref appendPrintEnabled, value);
}
}
#endregion
#region 常规打印按钮状态

@ -0,0 +1,114 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using log4net;
using System.Windows;
using Admin.Core.Common;
using Admin.Core.IService;
using Admin.Core.Service;
using Microsoft.Extensions.DependencyInjection;
using System.Collections.ObjectModel;
using Admin.Core.Model.Model_New;
using StackExchange.Profiling.Internal;
using System;
using System.Text.Json;
using Aucma.Core.PrintTo.Models;
using System.Windows.Input;
namespace Aucma.Core.PrintTo.ViewModels
{
public partial class LoginPageViewModel : ObservableObject
{
private static readonly log4net.ILog log = LogManager.GetLogger(typeof(LoginPageViewModel));
protected readonly IBaseTeamMembersServices _baseTeamMembersServices;
public LoginPageViewModel() {
_baseTeamMembersServices = App.ServiceProvider.GetService<IBaseTeamMembersServices>();
AddTeamData();
}
#region 登录
/// <summary>
/// 登录
/// </summary>
/// <param name="team">选择的班组信息</param>
/// <param name="userName">用户名</param>
/// <param name="passWord">密码</param>
public void Login(BaseTeamMembers team, string userName, string passWord)
{
//获取Token
string url = $"http://10.100.72.10:8080/login";
var content = new
{
username = userName,
password = passWord
};
var loginResult = HttpHelper.Post(url, content.ToJson());//发送用户名密码给API
Result result = JsonSerializer.Deserialize<Result>(loginResult);
if (result == null)
{
MessageBox.Show("登录失败!","系统提醒");
return ;
}
if (result.code == 200)
{
//跳转
MessageBox.Show("登录成功!", "系统提醒");
//new MainWindowViewModel().ShowDialog();
return;
}
else
{
MessageBox.Show($"登录失败!{result.msg}", "系统提醒");
return;
}
}
#endregion
#region 关闭当前界面
/// <summary>
/// 关闭当前界面
/// </summary>
/// <param name="parameter"></param>
[RelayCommand]
public void CloseWindow(object parameter)
{
var window = parameter as Window;
if (window == null) return;
window.Close();
}
#endregion
#region 班组数据
/// <summary>
/// 班组数据
/// </summary>
private ObservableCollection<BaseTeamMembers> _teamMembersList = new ObservableCollection<BaseTeamMembers>();
public ObservableCollection<BaseTeamMembers> TeamMembersList
{
get
{
return this._teamMembersList;
}
set
{
SetProperty(ref _teamMembersList, value);
}
}
#endregion
#region 班组添加到集合中
public void AddTeamData()
{
var baseTeamMembersList = _baseTeamMembersServices.QueryAsync(d => d.ProductLineCode.Contains("CX_02")).Result;
foreach (var item in baseTeamMembersList)
{
TeamMembersList.Add(item);
}
}
#endregion
}
}

@ -166,7 +166,10 @@
<Label Content="查询条件" VerticalAlignment="Center" Foreground="White" />
<TextBox x:Name="queryParam" Text="" Style="{x:Null}" PreviewMouseDoubleClick="queryParam_PreviewMouseDown" Width="300" HorizontalAlignment="Left" VerticalContentAlignment="Center"/>
<Button Content="查询" Background="#4285DE" Width="100" Height="40" Margin="5 0" Command="{Binding QueryStringCommand}" CommandParameter="{Binding Text, ElementName=queryParam}"/>
<WrapPanel VerticalAlignment="Center">
<RadioButton Content="一线" Foreground="White" FontSize="18" BorderBrush="White" x:Name="one" Margin="30 0" Command="{Binding ProductRadioQueryCommand}" CommandParameter="{Binding Name, ElementName=1}"/>
<RadioButton Content="二线" Foreground="White" FontSize="18" BorderBrush="White" x:Name="two" Margin="30 0" Command="{Binding ProductRadioQueryCommand}" CommandParameter="{Binding Name, ElementName=2}"/>
</WrapPanel>
</WrapPanel>
<UniformGrid Grid.Row="1" Margin="0 5 0 0" x:Name="HeightPanel">
<!--
@ -179,7 +182,7 @@
ItemsSource="{Binding Datalist}" ColumnWidth="*" AutoGenerateColumns="False" IsReadOnly="True" CanUserAddRows="False" SelectionMode="Single"
SelectedItem="{Binding SelectedCells, Mode=OneWayToSource}">
<DataGrid.Columns>
<DataGridTextColumn Width="1*" Binding="{Binding CreatedTime, StringFormat=\{0:yyy-MM-dd\}}" Header="订单日期" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="1*" Binding="{Binding BeginDate, StringFormat=\{0:yyy-MM-dd\}}" Header="订单日期" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="0.5*" Binding="{Binding ProductLineName}" Header="产线" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="1*" Binding="{Binding OrderCode}" Header="SAP订单编号" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="1.2*" Binding="{Binding ProductCode}" Header="产品编码" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
@ -258,8 +261,8 @@
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"/>
<Button
Background="#4285DE" Height="40"
Content="追" Margin="5 10 0 0" Width="100" Command="{Binding AppendPrintCommand}" CommandParameter="{Binding ElementName=ProductNo,Path=Text}"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"/>
Content="追打" IsEnabled="{Binding AppendPrintEnabled}" Margin="5 10 0 0" Width="100" Command="{Binding AppendPrintCommand}" CommandParameter="{Binding ElementName=ProductNo,Path=Text}"
/>
<Button
Background="#4285DE" Height="40"
Content="特殊" Margin="5 10 0 0" Width="100" Command="{Binding SpecialPrintCommand}"

@ -10,31 +10,67 @@
x:Name="MainWindow"
FontFamily="Microsoft YaHei"
WindowStartupLocation="CenterScreen"
WindowState="Maximized" d:DesignWidth="1200" d:DesignHeight="900"
WindowStyle="ToolWindow" ResizeMode="NoResize">
WindowState="Maximized" d:DesignWidth="1200" d:DesignHeight="900"
>
<Window.Background>
<ImageBrush ImageSource="/Assets/Images/login-background.png" />
</Window.Background>
<Border Margin="5" Background="Transparent" CornerRadius="10" >
<Border.Effect>
<DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
</Border.Effect>
<Border Margin="5" Background="Transparent">
<Grid>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="2*"/>
<RowDefinition/>
</Grid.RowDefinitions>
<UniformGrid Rows="0">
<UniformGrid Grid.Row="0">
<StackPanel HorizontalAlignment="Left">
<Image Source="/Assets/Images/Newlog.png" Width="100" />
</StackPanel>
</UniformGrid>
<UniformGrid Rows="1">
<UniformGrid Grid.Row="1" Margin="0 10">
<Border BorderThickness="4" CornerRadius="5" x:Name="DialogHost" Width="400" Height="350" VerticalAlignment="Center" HorizontalAlignment="Center" >
<StackPanel Background="White">
<ComboBox Margin="0 50 0 0"
x:Name="selectTeamComboBox"
Width="300"
BorderThickness="1"
BorderBrush="{StaticResource MaterialDesignDivider}"
materialDesign:HintAssist.Hint="班组"
SelectedValuePath="TeamCode"
DisplayMemberPath="TeamName"
ItemsSource="{Binding TeamMembersList}"
Style="{StaticResource MaterialDesignOutlinedComboBox}" />
<TextBox Margin="0 10 0 0"
x:Name="txtUserName"
Width="300"
FontSize="18"
materialDesign:HintAssist.Hint="账号"
BorderThickness="1"
BorderBrush="{StaticResource MaterialDesignDivider}"
Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
<PasswordBox
Margin="0 10 0 0"
x:Name="txtPassword"
Width="300"
FontSize="12"
materialDesign:HintAssist.Hint="密码"
BorderThickness="1"
BorderBrush="{StaticResource MaterialDesignDivider}"
Style="{StaticResource MaterialDesignOutlinedPasswordBox}"/>
<Button Margin="0 20 0 0"
x:Name="loginBtn"
Style="{StaticResource MaterialDesignFlatMidBgButton}"
Width="300"
Height="53"
Command="{Binding LoginCommand}"
materialDesign:ButtonAssist.CornerRadius="10"
Content="登录" Click="loginBtn_Click"/>
</StackPanel>
</Border>
</UniformGrid>
<UniformGrid Rows="2">
<UniformGrid Grid.Row="2">
</UniformGrid>
</Grid>

@ -1,4 +1,6 @@
using System;
using Admin.Core.Model.Model_New;
using Aucma.Core.PrintTo.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@ -19,9 +21,37 @@ namespace Aucma.Core.PrintTo.Views
/// </summary>
public partial class LoginPageView : Window
{
LoginPageViewModel loginViewModel = new LoginPageViewModel();
public LoginPageView()
{
InitializeComponent();
this.DataContext = loginViewModel;
}
private void loginBtn_Click(object sender, RoutedEventArgs e)
{
string userName = txtUserName.Text;
string passWord = txtPassword.Password;
BaseTeamMembers teamMembers = (BaseTeamMembers)this.selectTeamComboBox.SelectedItem;
if (teamMembers==null)
{
MessageBox.Show("请选择班组!","系统提醒");
return;
}
// 非空校验,账号密码正则校验
if (string.IsNullOrWhiteSpace(userName))
{
MessageBox.Show("用户名不可为空!", "系统提醒");
return;
}
if (string.IsNullOrWhiteSpace(passWord))
{
MessageBox.Show("密码不可为空!", "系统提醒");
return;
}
// 登录校验
loginViewModel.Login(teamMembers,userName, passWord);
}
}
}

@ -384,7 +384,7 @@ namespace Aucma.Core.Tasks
}
else
{
report.FinishTime = check.FinishTime;
//report.FinishTime = check.FinishTime;
report.UpdatedTime = null;
}
@ -395,12 +395,12 @@ namespace Aucma.Core.Tasks
report.QualityDefectCode = check.QualityDefectCode;
report.QualityDefectName = check.QualityDefectName;
report.TreatmentMeasure = check.TreatmentMeasure;
report.ProcessResult = check.ProcessResult;
//report.ProcessResult = check.ProcessResult;
report.GroupCode = check.GroupCode;
report.InspectorCode = check.InspectorCode;
report.InspectorTime = check.InspectorTime;
report.ReworkNumber = check.ReworkNumber;
report.IsFlag = check.IsFlag;
//report.ReworkNumber = check.ReworkNumber;
//report.IsFlag = check.IsFlag;
report.StationCode = check.StationCode;
report.UpdatedTime = DateTime.Now;
int reportResult = await _reportQualityInspectionServices.AddAsync(report);

@ -228,7 +228,7 @@ namespace Aucma.Core.TemperatureTask
}
else
{
report.FinishTime = check.FinishTime;
//report.FinishTime = check.FinishTime;
report.UpdatedTime = null;
}
@ -239,12 +239,12 @@ namespace Aucma.Core.TemperatureTask
report.QualityDefectCode = check.QualityDefectCode;
report.QualityDefectName = check.QualityDefectName;
report.TreatmentMeasure = check.TreatmentMeasure;
report.ProcessResult = check.ProcessResult;
//report.ProcessResult = check.ProcessResult;
report.GroupCode = check.GroupCode;
report.InspectorCode = check.InspectorCode;
report.InspectorTime = check.InspectorTime;
report.ReworkNumber = check.ReworkNumber;
report.IsFlag = check.IsFlag;
//report.ReworkNumber = check.ReworkNumber;
//report.IsFlag = check.IsFlag;
report.StationCode = check.StationCode;
report.UpdatedTime = check.UpdateTime;
int reportResult = _reportQualityInspectionServices.AddAsync(report).Result;
@ -265,14 +265,4 @@ namespace Aucma.Core.TemperatureTask
}
#endregion
}
public class Result{
/// <summary>
/// 返回抓鬼太
/// </summary>
public int code { get; set; }
/// <summary>
/// 返回信息
/// </summary>
public string msg { get; set; }
}
}

Loading…
Cancel
Save