222

schangxiang@126.com

2024-11-27 19718e4a5dc6312173d4f44e630f50df2ee4f5b7

222

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs

@@ -63,6 +63,7 @@
    public const string printCenterGroupName = "打印中心";

    public const string ThirdInterFaceServiceGroupName = "第三方服务接口管理";
    public const string ThirdInterFaceGroupName = "第三方服务接口管理2";


}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_Gather.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,128 @@
using Admin.NET.Core;

/*
 * @author : åˆ˜æ–‡å¥‡
 * @date : 2024/5/29上午10:26:39
 * @desc : è°ƒåº¦ä»»åŠ¡
 */
namespace Admin.NET.Application.Entity
{
    /// <summary>
    /// åŒ…汇总数据
    /// </summary>
    [SugarTable("mes_package_gather", "包汇总数据")]
    public class Mes_Package_Gather : EntityBase
    {

        [Required]
        [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "批次号", Length = 50)]
        public string PlanNo { get; set; }

        [Required]
        [SugarColumn(ColumnName = "OrderId", ColumnDescription = "订单号", Length = 50)]
        public string OrderId { get; set; }

        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        [SugarColumn(ColumnName = "Info5", ColumnDescription = "生产单号", Length = 60)]
        public string? Info5 { get; set; }


        #region wms新增字段 ã€Editby shaocx,2024-11-20】

        /// <summary>
        /// æ‰€åœ¨åŒºåŸŸ
        /// </summary>
        [SugarColumn(ColumnName = "AreaCode", ColumnDescription = "所在区域")]
        public AreaCodeEnum? AreaCode { get; set; } = AreaCodeEnum.无区域;


        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        [Required]
        [SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "板料状态")]
        public UpiStatusEnum UpiStatus { get; set; } = UpiStatusEnum.初始;

        #endregion


        #region åŒ…装线有关

        [Required]
        [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "包装号", Length = 50)]
        public string PackageCode { get; set; }



        #endregion



        [SugarColumn(ColumnName = "Info1", ColumnDescription = "纸箱长", Length = 50)]
        public float? Info1 { get; set; }

        [SugarColumn(ColumnName = "Info2", ColumnDescription = "纸箱宽", Length = 50)]
        public float? Info2 { get; set; }

        [SugarColumn(ColumnName = "Info3", ColumnDescription = "纸箱高", Length = 50)]
        public float? Info3 { get; set; }
        /// <summary>
        /// é”€å”®åˆåŒå•å·
        /// </summary>
        [SugarColumn(ColumnName = "Info4", ColumnDescription = "销售合同单号", Length = 60)]
        public string? Info4 { get; set; }



        /// <summary>
        /// ç¬¬å‡ åŒ…
        /// </summary>
        [SugarColumn(ColumnName = "Info6", ColumnDescription = "第几包", Length = 60)]
        public string? Info6 { get; set; }

        /// <summary>
        /// ç»é”€åº—名称
        /// </summary>
        [SugarColumn(ColumnName = "Info7", ColumnDescription = "经销店名称", Length = 60)]
        public string? Info7 { get; set; }

        /// <summary>
        /// äº§å“åç§°
        /// </summary>
        [SugarColumn(ColumnName = "Info8", ColumnDescription = "产品名称", Length = 60)]
        public string? Info8 { get; set; }

        /// <summary>
        /// å®¢æˆ·åç§°
        /// </summary>
        [SugarColumn(ColumnName = "Info10", ColumnDescription = "客户名称", Length = 60)]
        public string? Info10 { get; set; }

        /// <summary>
        /// åŒ…装编码
        /// </summary>
        [SugarColumn(ColumnName = "Info9", ColumnDescription = "包装编码", Length = 60)]
        public string? Info9 { get; set; }

        /// <summary>
        /// è‡ªæor发货
        /// </summary>
        [SugarColumn(ColumnName = "Info11", ColumnDescription = "自提or发货", Length = 60)]
        public string? Info11 { get; set; }

        /// <summary>
        /// åŒ…装部件总数量
        /// </summary>
        [SugarColumn(ColumnName = "Info12", ColumnDescription = "包装部件总数量", Length = 60)]
        public string? Info12 { get; set; }

        /// <summary>
        /// åŒ…装面积
        /// </summary>
        [SugarColumn(ColumnName = "Info13", ColumnDescription = "包装面积", Length = 60)]
        public string? Info13 { get; set; }

    }
}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_LineQueue.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,128 @@
using Admin.NET.Core;

/*
 * @author : åˆ˜æ–‡å¥‡
 * @date : 2024/5/29上午10:26:39
 * @desc : è°ƒåº¦ä»»åŠ¡
 */
namespace Admin.NET.Application.Entity
{
    /// <summary>
    /// åŒ…产线队列数据
    /// </summary>
    [SugarTable("mes_package_linequeue", "包产线队列数据")]
    public class Mes_Package_LineQueue : EntityBase
    {

        [Required]
        [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "批次号", Length = 50)]
        public string PlanNo { get; set; }

        [Required]
        [SugarColumn(ColumnName = "OrderId", ColumnDescription = "订单号", Length = 50)]
        public string OrderId { get; set; }

        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        [SugarColumn(ColumnName = "Info5", ColumnDescription = "生产单号", Length = 60)]
        public string? Info5 { get; set; }


        #region wms新增字段 ã€Editby shaocx,2024-11-20】

        /// <summary>
        /// æ‰€åœ¨åŒºåŸŸ
        /// </summary>
        [SugarColumn(ColumnName = "AreaCode", ColumnDescription = "所在区域")]
        public AreaCodeEnum? AreaCode { get; set; } = AreaCodeEnum.无区域;


        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        [Required]
        [SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "板料状态")]
        public UpiStatusEnum UpiStatus { get; set; } = UpiStatusEnum.初始;

        #endregion


        #region åŒ…装线有关

        [Required]
        [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "包装号", Length = 50)]
        public string PackageCode { get; set; }



        #endregion



        [SugarColumn(ColumnName = "Info1", ColumnDescription = "纸箱长", Length = 50)]
        public float? Info1 { get; set; }

        [SugarColumn(ColumnName = "Info2", ColumnDescription = "纸箱宽", Length = 50)]
        public float? Info2 { get; set; }

        [SugarColumn(ColumnName = "Info3", ColumnDescription = "纸箱高", Length = 50)]
        public float? Info3 { get; set; }
        /// <summary>
        /// é”€å”®åˆåŒå•å·
        /// </summary>
        [SugarColumn(ColumnName = "Info4", ColumnDescription = "销售合同单号", Length = 60)]
        public string? Info4 { get; set; }



        /// <summary>
        /// ç¬¬å‡ åŒ…
        /// </summary>
        [SugarColumn(ColumnName = "Info6", ColumnDescription = "第几包", Length = 60)]
        public string? Info6 { get; set; }

        /// <summary>
        /// ç»é”€åº—名称
        /// </summary>
        [SugarColumn(ColumnName = "Info7", ColumnDescription = "经销店名称", Length = 60)]
        public string? Info7 { get; set; }

        /// <summary>
        /// äº§å“åç§°
        /// </summary>
        [SugarColumn(ColumnName = "Info8", ColumnDescription = "产品名称", Length = 60)]
        public string? Info8 { get; set; }

        /// <summary>
        /// å®¢æˆ·åç§°
        /// </summary>
        [SugarColumn(ColumnName = "Info10", ColumnDescription = "客户名称", Length = 60)]
        public string? Info10 { get; set; }

        /// <summary>
        /// åŒ…装编码
        /// </summary>
        [SugarColumn(ColumnName = "Info9", ColumnDescription = "包装编码", Length = 60)]
        public string? Info9 { get; set; }

        /// <summary>
        /// è‡ªæor发货
        /// </summary>
        [SugarColumn(ColumnName = "Info11", ColumnDescription = "自提or发货", Length = 60)]
        public string? Info11 { get; set; }

        /// <summary>
        /// åŒ…装部件总数量
        /// </summary>
        [SugarColumn(ColumnName = "Info12", ColumnDescription = "包装部件总数量", Length = 60)]
        public string? Info12 { get; set; }

        /// <summary>
        /// åŒ…装面积
        /// </summary>
        [SugarColumn(ColumnName = "Info13", ColumnDescription = "包装面积", Length = 60)]
        public string? Info13 { get; set; }

    }
}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_UnLine_Record.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,128 @@
using Admin.NET.Core;

/*
 * @author : åˆ˜æ–‡å¥‡
 * @date : 2024/5/29上午10:26:39
 * @desc : è°ƒåº¦ä»»åŠ¡
 */
namespace Admin.NET.Application.Entity
{
    /// <summary>
    /// åŒ…产线下线记录数据
    /// </summary>
    [SugarTable("mes_package_unline_record", "包产线下线记录数据")]
    public class Mes_Package_UnLine_Record : EntityBase
    {

        [Required]
        [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "批次号", Length = 50)]
        public string PlanNo { get; set; }

        [Required]
        [SugarColumn(ColumnName = "OrderId", ColumnDescription = "订单号", Length = 50)]
        public string OrderId { get; set; }

        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        [SugarColumn(ColumnName = "Info5", ColumnDescription = "生产单号", Length = 60)]
        public string? Info5 { get; set; }


        #region wms新增字段 ã€Editby shaocx,2024-11-20】

        /// <summary>
        /// æ‰€åœ¨åŒºåŸŸ
        /// </summary>
        [SugarColumn(ColumnName = "AreaCode", ColumnDescription = "所在区域")]
        public AreaCodeEnum? AreaCode { get; set; } = AreaCodeEnum.无区域;


        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        [Required]
        [SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "板料状态")]
        public UpiStatusEnum UpiStatus { get; set; } = UpiStatusEnum.初始;

        #endregion


        #region åŒ…装线有关

        [Required]
        [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "包装号", Length = 50)]
        public string PackageCode { get; set; }



        #endregion



        [SugarColumn(ColumnName = "Info1", ColumnDescription = "纸箱长", Length = 50)]
        public float? Info1 { get; set; }

        [SugarColumn(ColumnName = "Info2", ColumnDescription = "纸箱宽", Length = 50)]
        public float? Info2 { get; set; }

        [SugarColumn(ColumnName = "Info3", ColumnDescription = "纸箱高", Length = 50)]
        public float? Info3 { get; set; }
        /// <summary>
        /// é”€å”®åˆåŒå•å·
        /// </summary>
        [SugarColumn(ColumnName = "Info4", ColumnDescription = "销售合同单号", Length = 60)]
        public string? Info4 { get; set; }



        /// <summary>
        /// ç¬¬å‡ åŒ…
        /// </summary>
        [SugarColumn(ColumnName = "Info6", ColumnDescription = "第几包", Length = 60)]
        public string? Info6 { get; set; }

        /// <summary>
        /// ç»é”€åº—名称
        /// </summary>
        [SugarColumn(ColumnName = "Info7", ColumnDescription = "经销店名称", Length = 60)]
        public string? Info7 { get; set; }

        /// <summary>
        /// äº§å“åç§°
        /// </summary>
        [SugarColumn(ColumnName = "Info8", ColumnDescription = "产品名称", Length = 60)]
        public string? Info8 { get; set; }

        /// <summary>
        /// å®¢æˆ·åç§°
        /// </summary>
        [SugarColumn(ColumnName = "Info10", ColumnDescription = "客户名称", Length = 60)]
        public string? Info10 { get; set; }

        /// <summary>
        /// åŒ…装编码
        /// </summary>
        [SugarColumn(ColumnName = "Info9", ColumnDescription = "包装编码", Length = 60)]
        public string? Info9 { get; set; }

        /// <summary>
        /// è‡ªæor发货
        /// </summary>
        [SugarColumn(ColumnName = "Info11", ColumnDescription = "自提or发货", Length = 60)]
        public string? Info11 { get; set; }

        /// <summary>
        /// åŒ…装部件总数量
        /// </summary>
        [SugarColumn(ColumnName = "Info12", ColumnDescription = "包装部件总数量", Length = 60)]
        public string? Info12 { get; set; }

        /// <summary>
        /// åŒ…装面积
        /// </summary>
        [SugarColumn(ColumnName = "Info13", ColumnDescription = "包装面积", Length = 60)]
        public string? Info13 { get; set; }

    }
}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs

@@ -15,9 +15,13 @@
public class ThirdInterFaceService : IDynamicApiController, ITransient
{
    private readonly SqlSugarRepository<Mes_BatchOrderUPI_New> _rep;
    public ThirdInterFaceService(SqlSugarRepository<Mes_BatchOrderUPI_New> rep)
    private readonly SqlSugarRepository<Mes_Package_Gather> _mes_Package_Gather_Rep;
    public ThirdInterFaceService(SqlSugarRepository<Mes_BatchOrderUPI_New> rep,
        SqlSugarRepository<Mes_Package_Gather> mes_Package_Gather_Rep
        )
    {
        _rep = rep;
        _mes_Package_Gather_Rep = mes_Package_Gather_Rep;
    }

    [HttpPost]
@@ -41,18 +45,33 @@
            throw Oops.Oh("本次有重复的UPI！重复号为:" + dit.Key + ",重复条数:" + dit.Value);
        }

        List<string> upis = new List<string>();
        input.ForEach(x => upis.Add(x.UPI));//upis是传过来的upi字段集合
        List<string> packageList = new List<string>();
        input.ForEach(x => packageList.Add(x.PackageCode));//upis是传过来的upi字段集合

        var batchOrderUPIs = await _rep.AsQueryable().Where(x => upis.Contains(x.UPI)).ToListAsync();//batchOrderUPIs是重复的upi集合
        var batchOrderUPIs = await _rep.AsQueryable().Where(x => packageList.Contains(x.PackageCode)).ToListAsync();//batchOrderUPIs是重复的upi集合
        //批量删除
        await _rep.DeleteAsync(batchOrderUPIs);

        //批量删除
        await _mes_Package_Gather_Rep.DeleteAsync(x => packageList.Contains(x.PackageCode));

        foreach (var item in input)
        {
            item.AreaCode = AreaCodeEnum.无区域;
            item.UpiStatus = UpiStatusEnum.初始;
        }
        List<Mes_Package_Gather> addGatherList = new List<Mes_Package_Gather>();
        var groups = input.GroupBy(x => x.PackageCode);
        foreach (var group in groups)
        {
            var first = group.ToList().First();
            Mes_Package_Gather newGather = first.Adapt<Mes_Package_Gather>();
            newGather.AreaCode = AreaCodeEnum.无区域;
            newGather.UpiStatus = UpiStatusEnum.初始;
            addGatherList.Add(newGather);
        }
        await _mes_Package_Gather_Rep.InsertRangeAsync(addGatherList);

        await _rep.InsertRangeAsync(input);
    }


 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs

ÎļþÒÑɾ³ý

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs

ÎļþÒÑɾ³ý

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/MesPushPackageCodeService.cs

ÎļþÒÑɾ³ý