巡检适配

啊鑫

2024-08-22 2cad690178b5373db94075f9355a390a7eba6a44

巡检适配

 MES.Service/Modes/MesItems.cs

@@ -1,7 +1,10 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;

namespace MES.Service.Modes;

namespace MES.Service.Modes
{
/// <summary>
///     物料信息
/// </summary>
@@ -18,73 +21,73 @@
    ///     工厂
    /// </summary>
    [SugarColumn(ColumnName = "FACTORY")]
    public string? Factory { get; set; }
        public string Factory { get; set; }

    /// <summary>
    ///     公司编号
    /// </summary>
    [SugarColumn(ColumnName = "COMPANY")]
    public string? Company { get; set; }
        public string Company { get; set; }

    /// <summary>
    ///     物料编码 = ERP物料编号||颜色编号
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_NO")]
    public string? ItemNo { get; set; }
        public string ItemNo { get; set; }

    /// <summary>
    ///     物料名称
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_NAME")]
    public string? ItemName { get; set; }
        public string ItemName { get; set; }

    /// <summary>
    ///     物料简称
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_SNAME")]
    public string? ItemSname { get; set; }
        public string ItemSname { get; set; }

    /// <summary>
    ///     规格型号
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_MODEL")]
    public string? ItemModel { get; set; }
        public string ItemModel { get; set; }

    /// <summary>
    ///     物料描述
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_DESCRIPTION")]
    public string? ItemDescription { get; set; }
        public string ItemDescription { get; set; }

    /// <summary>
    ///     物料单位
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_UNIT")]
    public string? ItemUnit { get; set; }
        public string ItemUnit { get; set; }

    /// <summary>
    ///     物料类型
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_TYPE")]
    public string? ItemType { get; set; }
        public string ItemType { get; set; }

    /// <summary>
    ///     产品版本
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_VERSION")]
    public string? ItemVersion { get; set; }
        public string ItemVersion { get; set; }

    /// <summary>
    ///     客户编号
    /// </summary>
    [SugarColumn(ColumnName = "CUST_NO")]
    public string? CustNo { get; set; }
        public string CustNo { get; set; }

    /// <summary>
    ///     创建人
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_BY")]
    public string? CreateBy { get; set; }
        public string CreateBy { get; set; }

    /// <summary>
    ///     创建时间
@@ -96,7 +99,7 @@
    ///     最后更新人
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_BY")]
    public string? LastupdateBy { get; set; }
        public string LastupdateBy { get; set; }

    /// <summary>
    ///     最后更新时间
@@ -126,25 +129,25 @@
    ///     订单单位
    /// </summary>
    [SugarColumn(ColumnName = "ORDERUNIT")]
    public string? Orderunit { get; set; }
        public string Orderunit { get; set; }

    /// <summary>
    ///     销售单位
    /// </summary>
    [SugarColumn(ColumnName = "SALEUNIT")]
    public string? Saleunit { get; set; }
        public string Saleunit { get; set; }

    /// <summary>
    ///     库房单位
    /// </summary>
    [SugarColumn(ColumnName = "STOREUNIT")]
    public string? Storeunit { get; set; }
        public string Storeunit { get; set; }

    /// <summary>
    ///     生产单位
    /// </summary>
    [SugarColumn(ColumnName = "PRODUCTUNIT")]
    public string? Productunit { get; set; }
        public string Productunit { get; set; }

    /// <summary>
    ///     物料ID
@@ -156,43 +159,43 @@
    ///     ERP料号
    /// </summary>
    [SugarColumn(ColumnName = "ERP_ITEM_NO")]
    public string? ErpItemNo { get; set; }
        public string ErpItemNo { get; set; }

    /// <summary>
    ///     默认仓库
    /// </summary>
    [SugarColumn(ColumnName = "DEPOT_CODE")]
    public string? DepotCode { get; set; }
        public string DepotCode { get; set; }

    /// <summary>
    ///     物料分类编号
    /// </summary>
    [SugarColumn(ColumnName = "PPBOM00019124")]
    public string? Ppbom00019124 { get; set; }
        public string Ppbom00019124 { get; set; }

    /// <summary>
    ///     物料分组
    /// </summary>
    [SugarColumn(ColumnName = "REMARKS")]
    public string? Remarks { get; set; }
        public string Remarks { get; set; }

    /// <summary>
    ///     采购员
    /// </summary>
    [SugarColumn(ColumnName = "FPURCHASERID")]
    public string? Fpurchaserid { get; set; }
        public string Fpurchaserid { get; set; }

    /// <summary>
    ///     禁用状态
    /// </summary>
    [SugarColumn(ColumnName = "FFORBIDSTATUS")]
    public string? Fforbidstatus { get; set; }
        public string Fforbidstatus { get; set; }

    /// <summary>
    ///     物料分组
    /// </summary>
    [SugarColumn(ColumnName = "FMATERIALGROUP")]
    public string? Fmaterialgroup { get; set; }
        public string Fmaterialgroup { get; set; }

    /// <summary>
    ///     完工超收比例
@@ -204,67 +207,116 @@
    ///     发料方式
    /// </summary>
    [SugarColumn(ColumnName = "FISSUETYPE")]
    public string? Fissuetype { get; set; }
        public string Fissuetype { get; set; }

    /// <summary>
    ///     启用批号管理
    /// </summary>
    [SugarColumn(ColumnName = "FISBATCHMANAGE")]
    public int? Fisbatchmanage { get; set; }
        public decimal? Fisbatchmanage { get; set; }

    /// <summary>
    ///     采购单位
    /// </summary>
    [SugarColumn(ColumnName = "FPURCHASEUNITID")]
    public decimal? Fpurchaseunitid { get; set; }
        public string Fpurchaseunitid { get; set; }

    /// <summary>
    ///     自定义字段1
    /// </summary>
    [SugarColumn(ColumnName = "REMARK1")]
    public string? Remark1 { get; set; }
        public string Remark1 { get; set; }

    /// <summary>
    ///     自定义字段2
    /// </summary>
    [SugarColumn(ColumnName = "REMARK2")]
    public string? Remark2 { get; set; }
        public string Remark2 { get; set; }

    /// <summary>
    ///     自定义字段3
    /// </summary>
    [SugarColumn(ColumnName = "REMARK3")]
    public string? Remark3 { get; set; }
        public string Remark3 { get; set; }

    /// <summary>
    ///     自定义字段4
    /// </summary>
    [SugarColumn(ColumnName = "REMARK4")]
    public string? Remark4 { get; set; }
        public string Remark4 { get; set; }

    /// <summary>
    ///     自定义字段5
    /// </summary>
    [SugarColumn(ColumnName = "REMARK5")]
    public string? Remark5 { get; set; }
        public string Remark5 { get; set; }

    /// <summary>
    ///     生产车间
    /// </summary>
    [SugarColumn(ColumnName = "PRODUCTION_WORKSHOP")]
    public string? ProductionWorkshop { get; set; }
        public string ProductionWorkshop { get; set; }

    /// <summary>
    ///     物料属性
    /// </summary>
    [SugarColumn(ColumnName = "MATERIAL_PROPERTI")]
    public string? MaterialProperti { get; set; }
        public string MaterialProperti { get; set; }

        /// <summary>
        /// 生产单位 
        ///</summary>
    [SugarColumn(ColumnName = "PRODUCE_UNIT")]
    public string? ProduceUnit { get; set; }
        public string ProduceUnit { get; set; }

        /// <summary>
        /// 委外单位 
        ///</summary>
    [SugarColumn(ColumnName = "SUBCON_UNIT")]
    public string? SubconUnit { get; set; }
        public string SubconUnit { get; set; }

        /// <summary>
        /// 图片1 
        ///</summary>
        [SugarColumn(ColumnName = "BZ06")]
        public string Bz06 { get; set; }

        /// <summary>
        /// 图片2 
        ///</summary>
        [SugarColumn(ColumnName = "BZ07")]
        public string Bz07 { get; set; }

        /// <summary>
        /// 图片3 
        ///</summary>
        [SugarColumn(ColumnName = "BZ08")]
        public string Bz08 { get; set; }

        /// <summary>
        /// 图片4 
        ///</summary>
        [SugarColumn(ColumnName = "BZ09")]
        public string Bz09 { get; set; }

        /// <summary>
        /// 图片5 
        ///</summary>
        [SugarColumn(ColumnName = "BZ10")]
        public string Bz10 { get; set; }

        /// <summary>
        /// QC分组ID 
        ///</summary>
        [SugarColumn(ColumnName = "QC_TEAMID")]
        public string QcTeamid { get; set; }

        /// <summary>
        /// 物料ID 
        ///</summary>
        [SugarColumn(ColumnName = "ITEM_ID")]
        public decimal? ItemId { get; set; }

    [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
}

 MES.Service/Modes/QsQaItemXj.cs

@@ -21,120 +21,117 @@
    public decimal? Id { get; set; }

    /// <summary>
    ///     工单号
    /// 检验单号 
    /// </summary>
    [Column("BILL_NO")]
    [SugarColumn(ColumnName = "BILL_NO")] //用于SqlSugar
    [StringLength(50, ErrorMessage = "工单号长度不能超出50")]
    public string? BillNo { get; set; }
    [SugarColumn(ColumnName = "RELEASE_NO")]
    public string? ReleaseNo { get; set; }

    /// <summary>
    /// 检验日期 
    ///</summary>
    [SugarColumn(ColumnName = "FCHECK_DATE")]
    public DateTime? FcheckDate { get; set; }

    /// <summary>
    /// 检验人员 
    ///</summary>
    [SugarColumn(ColumnName = "FCHECK_BY")]
    public string? FcheckBy { get; set; }

    /// <summary>
    /// 物料编码 
    ///</summary>
    [SugarColumn(ColumnName = "ITEM_NO")]
    public string? ItemNo { get; set; }

    /// <summary>
    /// 检验结果 
    ///</summary>
    [SugarColumn(ColumnName = "FCHECK_RESU")]
    public string? FcheckResu { get; set; }

    /// <summary>
    ///     创建人
    /// </summary>
    [Column("CREATE_BY")]
    [SugarColumn(ColumnName = "CREATE_BY")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "创建人长度不能超出100")]
    [SugarColumn(ColumnName = "CREATE_BY")]
    public string? CreateBy { get; set; }

    /// <summary>
    ///     创建日期
    /// </summary>
    [Column("CREATE_DATE")]
    [SugarColumn(ColumnName = "CREATE_DATE")] //用于SqlSugar
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; }

    /// <summary>
    ///     检验人员
    /// </summary>
    [Column("FCHECK_BY")]
    [SugarColumn(ColumnName = "FCHECK_BY")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "检验人员长度不能超出100")]
    public string? FcheckBy { get; set; }

    /// <summary>
    ///     检验日期
    /// </summary>
    [Column("FCHECK_DATE")]
    [SugarColumn(ColumnName = "FCHECK_DATE")] //用于SqlSugar
    public DateTime? FcheckDate { get; set; }

    /// <summary>
    ///     检验结果
    /// </summary>
    [Column("FCHECK_RESU")]
    [SugarColumn(ColumnName = "FCHECK_RESU")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "检验结果长度不能超出100")]
    public string? FcheckResu { get; set; }

    /// <summary>
    ///     物料编码
    /// </summary>
    [Column("ITEM_NO")]
    [SugarColumn(ColumnName = "ITEM_NO")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "物料编码长度不能超出100")]
    public string? ItemNo { get; set; }

    /// <summary>
    ///     单位
    /// </summary>
    [Column("ITEM_UNIT")]
    [SugarColumn(ColumnName = "ITEM_UNIT")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "单位长度不能超出100")]
    public string? ItemUnit { get; set; }

    /// <summary>
    ///     更新人
    /// </summary>
    [Column("LASTUPDATE_BY")]
    [SugarColumn(ColumnName = "LASTUPDATE_BY")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "更新人长度不能超出100")]
    [SugarColumn(ColumnName = "LASTUPDATE_BY")]
    public string? LastupdateBy { get; set; }

    /// <summary>
    ///     更新日期
    /// </summary>
    [Column("LASTUPDATE_DATE")]
    [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //用于SqlSugar
    [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
    public DateTime? LastupdateDate { get; set; }

    /// <summary>
    ///  
    /// </summary>
    [Column("MODIFY1_BY")]
    [SugarColumn(ColumnName = "MODIFY1_BY")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "Modify1By长度不能超出100")]
    [SugarColumn(ColumnName = "MODIFY1_BY")]
    public string? Modify1By { get; set; }

    /// <summary>
    ///     检验单号
    /// 单位 
    /// </summary>
    [Column("RELEASE_NO")]
    [SugarColumn(ColumnName = "RELEASE_NO")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "检验单号长度不能超出100")]
    public string? ReleaseNo { get; set; }
    [SugarColumn(ColumnName = "ITEM_UNIT")]
    public string? ItemUnit { get; set; }

    /// <summary>
    /// 工单号 
    ///</summary>
    [SugarColumn(ColumnName = "BILL_NO")]
    public string? BillNo { get; set; }

    /// <summary>
    ///     模具号
    /// </summary>
    [Column("MOID_NUM")]
    [SugarColumn(ColumnName = "MOID_NUM")] //用于SqlSugar
    [StringLength(50, ErrorMessage = "模具号长度不能超出50")]
    [SugarColumn(ColumnName = "MOID_NUM")]
    public string? MoidNum { get; set; }

    [Column("Remarks")]
    [SugarColumn(ColumnName = "Remarks")] //用于SqlSugar
    [StringLength(200, ErrorMessage = "备注不能超出200")]
    /// <summary>
    ///  
    ///</summary>
    [SugarColumn(ColumnName = "FSUBMIT_BY")]
    public string? FsubmitBy { get; set; }

    /// <summary>
    ///  
    ///</summary>
    [SugarColumn(ColumnName = "FSUBMIT_DATE")]
    public DateTime? FsubmitDate { get; set; }

    /// <summary>
    ///  
    ///</summary>
    [SugarColumn(ColumnName = "FSUBMIT")]
    public decimal? Fsubmit { get; set; }

    /// <summary>
    /// 备注 
    ///</summary>
    [SugarColumn(ColumnName = "REMARKS")]
    public string? Remarks { get; set; }

    [SugarColumn(IsIgnore = true)] public decimal? CatQty { get; set; }
    /// <summary>
    /// 物料ID 
    ///</summary>
    [SugarColumn(ColumnName = "ITEM_ID")]
    public decimal? ItemId { get; set; }

    [SugarColumn(IsIgnore = true)] public string? Daa020 { get; set; }

    [SugarColumn(IsIgnore = true)] public string? DetailMem { get; set; }

    [SugarColumn(IsIgnore = true)] public string? TaskNo { get; set; }

    [SugarColumn(IsIgnore = true)] public string? BoardModel { get; set; }
    [SugarColumn(IsIgnore = true)] public decimal? PlanQty { get; set; }
    [SugarColumn(IsIgnore = true)] public string? Mocode { get; set; }
    [SugarColumn(IsIgnore = true)] public string? BoardStyle { get; set; }
    
    [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
    
    [SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }
}

 MES.Service/bin/Debug/net8.0/MES.Service.dll

Binary files differ

 MES.Service/bin/Debug/net8.0/MES.Service.pdb

Binary files differ

 MES.Service/service/BasicData/MesItemsManager.cs

@@ -145,7 +145,7 @@
            Fissuetype = item.FIssueType,
            Fisbatchmanage = item.FIsBatchManage,
            Fpurchaserid = item.FPurchaserId,
            Fpurchaseunitid = Convert.ToDecimal(item.FPurchaseUnitId),
            Fpurchaseunitid = item.FPurchaseUnitId,
            Storeunit = item.FStoreUnitID,
            Saleunit = item.FSaleUnitId,
            Fforbidstatus = item.FForbidStatus,
@@ -153,6 +153,7 @@
            ProductionWorkshop = item.FWorkShopId,
            ProduceUnit = item.FPRODUCEUNITID,
            SubconUnit = item.FSUBCONUNITID,
            CreateDate = DateTime.Now,
            Company = "1000",
            Factory = "1000"
        };

 MES.Service/service/QC/XJService.cs

@@ -83,7 +83,8 @@
            {
                Id = a.Id,
                Daa001 = a.Daa001,
                Daa003 = a.Daa003
                Daa003 = a.Daa003,
                Daa008 = a.Daa008
            }).ToList();
    }

@@ -98,8 +99,10 @@
            .Select<MesItems>((a, b) =>
                new MesItems
                {
                    Id = b.Id,
                    ItemNo = b.ItemNo,
                    ItemName = b.ItemName
                    ItemName = b.ItemName,
                    ItemModel = b.ItemModel,
                }).ToList();
    }

@@ -120,7 +123,7 @@
                new JoinQueryInfos(
                    JoinType.Inner, s.BillNo == a.Daa001,
                    JoinType.Left, a.Daa015 == c.LineNo,
                    JoinType.Left, s.ItemNo == b.ItemNo
                    JoinType.Left, s.ItemId == b.Id
                )
            )
            .WhereIF(lineNo != null && lineNo.Length > 0,
@@ -136,15 +139,16 @@
            .WhereIF(id > 0, (s, a, c, b) => s.Id == id)
            .Select((s, a, c, b) => new QsQaItemXj
            {
                MoidNum = s.MoidNum,
                Daa020 = c.LineNo,
                Id = s.Id,
                PlanQty = a.Daa008,
                CreateBy = s.CreateBy,
                CreateDate = s.CreateDate,
                ReleaseNo = s.ReleaseNo,
                ItemNo = s.ItemNo,
                ItemUnit = s.ItemUnit,
                BillNo = s.BillNo,
                ItemName = b.ItemName,
                ItemModel = b.ItemModel,
                FcheckBy = s.FcheckBy,
                FcheckResu = s.FcheckResu,
                Remarks = s.Remarks

 MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs

@@ -28,7 +28,7 @@
                    c.ItemNo == t.ItemNo && c.Company == t.Company &&
                    c.Factory == t.Factory,
                    JoinType.Left,
                    t.Fpurchaseunitid == u.Id && t.Factory == u.Factory &&
                    t.Fpurchaseunitid == u.Id.ToString() && t.Factory == u.Factory &&
                    t.Company == u.Company
                })
            .Where((c, t, u) => c.Mid == query.id)
@@ -67,7 +67,7 @@
                    JoinType.Inner,
                    a.ItemNo == c.ItemNo && a.Company == c.Company &&
                    a.Factory == c.Factory,
                    JoinType.Inner, c.Fpurchaseunitid == t.Id,
                    JoinType.Inner, c.Fpurchaseunitid == t.Id.ToString(),
                    JoinType.Inner, z.ReleaseNo == a.ReleaseNo
                })
            .Where((a, d, b, c, t, z) => a.FngHandle == "退货" &&

 MES.Service/service/Warehouse/OrganizeService.cs

@@ -109,7 +109,14 @@
                        return null;
                    }

                    cBarcode2 = "9" + serial.Substring(1);
                    if (string.IsNullOrEmpty(serial))
                    {
                        cBarcode2 = "9";
                    }
                    else
                    {
                        cBarcode2 = "9" + serial[1..];
                    }
                    itemBarcode = query.ItemNo + cIndate + cBarcode2;
                }
                else

 MESApplication/bin/Debug/net8.0/MES.Service.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MES.Service.pdb

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.exe

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.pdb

Binary files differ