Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine

zongzhibin

2024-11-28 0a9114107f0ff064a9ab93d8011b9fe8b57ac7b8

Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs

@@ -325,8 +325,14 @@
                        data.Add("Info13", item.Info13 ?? "");//当前包面积
                        data.Add("printTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));

                        //mycontext.mes
                        data.Add("leijisaomiaomj", item.Info13 ?? "");//累计扫描面积
                        var finsiList = mycontext.mes_package_gather.Where(x => x.Info5 == item.Info5 && x.UpiStatus >= (int)UpiStatusEnum.已合包);
                        double leijisaomiaomj = 0;
                        foreach (var aa in finsiList)
                        {
                            leijisaomiaomj += Convert.ToDouble(aa.Info13);
                        }
                        leijisaomiaomj += Convert.ToDouble(item.Info13);
                        data.Add("leijisaomiaomj", leijisaomiaomj);//累计扫描面积

                        //查询下 åŒ…数据
                        var mylist = mycontext.mes_batchOrderUPI_new.Where(x => x.PackageCode == item.PackageCode).ToList();

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareModel/EnumType/WMS/UpiStatusEnum.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@


using System.ComponentModel;

namespace Admin.NET.Application { 

/// <summary>
/// æ¿æ–™çŠ¶æ€æžšä¸¾
/// </summary>
[Description("板料状态枚举")]
public enum UpiStatusEnum
{
        /// <summary>
        /// åˆå§‹
        /// </summary>
        [Description("初始")]
        åˆå§‹ = 0,

        /// <summary>
        /// ä¸é½åŒ…
        /// </summary>
        [Description("不齐包")]
        ä¸é½åŒ… = 1,

        /// <summary>
        /// å·²é½åŒ…
        /// </summary>
        [Description("已齐包")]
        å·²é½åŒ… = 2,

        /// <summary>
        /// ç åž›ä¸­
        /// </summary>
        [Description("码垛中")]
        ç åž›ä¸­ = 3,


        /// <summary>
        /// å·²ç åž›
        /// </summary>
        [Description("已码垛")]
        å·²ç åž› = 4,

        /// <summary>
        /// å·²åˆåŒ…
        /// </summary>
        [Description("已合包")]
        å·²åˆåŒ… = 5,

        /// <summary>
        /// å·²ä¸‹çº¿
        /// </summary>
        [Description("已下线")]
        å·²ä¸‹çº¿ = 6

    }
}

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareModel/iWareModel.csproj

@@ -126,6 +126,7 @@
    <Compile Include="EnumType\WMS\PrintClassifyEnum.cs" />
    <Compile Include="EnumType\WMS\PrintTypeEnum.cs" />
    <Compile Include="EnumType\WMS\SysDictDataEnum.cs" />
    <Compile Include="EnumType\WMS\UpiStatusEnum.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="Struct\WmsStorageType.cs" />
    <Compile Include="Struct\WmsCarrierType.cs" />

 LA24030_LuLiPackageLine_Print/´òÓ¡Ä£°åÎļþ/°ü×°ÌõÂëÄ£°å_¶þάÂë.btw

Binary files differ

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/ReportCenter/StockStatusEnum.cs

@@ -15,7 +15,20 @@
    /// å·²å†»ç»“
    /// </summary>
    [Description("已冻结")]
    å·²å†»ç»“ = 2
    å·²å†»ç»“ = 2,


    /// <summary>
    /// é½åŒ…待出库
    /// </summary>
    [Description("齐包待出库")]
    é½åŒ…待出库 = 3,

    /// <summary>
    /// äººå·¥å¼ºåˆ¶å¾…出库
    /// </summary>
    [Description("人工强制待出库")]
    äººå·¥å¼ºåˆ¶å¾…出库 = 4


}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,64 @@
using Admin.NET.Core.Service;
using Admin.NET.Application.Entity;
using Microsoft.AspNetCore.Http;
using System.Data;
using System.Web;
using System.Text;
namespace Admin.NET.Application;
/// <summary>
/// æ“ä½œä»»åŠ¡æœåŠ¡
/// </summary>
[ApiDescriptionSettings(ApplicationConst.WmsTaskGroupName, Order = 100)]
public class WmsOperationTaskService : IDynamicApiController, ITransient
{
    private readonly SqlSugarRepository<WmsRbLineTask> _rep;
    private readonly SqlSugarRepository<WmsStockQuan> _wmsStockQuanRep;
    public WmsOperationTaskService(SqlSugarRepository<WmsRbLineTask> rep, SqlSugarRepository<WmsStockQuan> wmsStockQuanRep)
    {
        _rep = rep;
        _wmsStockQuanRep = wmsStockQuanRep;
    }



    /// <summary>
    /// å¼ºåˆ¶å‡ºåº“
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "ForceOutbound")]
    [Description("WmsOperationTask/ForceOutbound")]
    public async Task ForceOutbound(ForceOutboundInput input)
    {
        if (input == null || input.PackageCodeList?.Count == 0)
        {
            throw Oops.Oh("参数不能为空");
        }
        List<WmsStockQuan> updateQuanList = new List<WmsStockQuan>();
        foreach (var item in input.PackageCodeList)
        {
            var quanList = await _wmsStockQuanRep.AsQueryable().Where(x => x.PackageCode == item).ToListAsync();
            var isExist = quanList.Where(x => x.StockStatus == StockStatusEnum.齐包待出库).Count();
            if (isExist > 0)
            {
                throw Oops.Oh($"包{item}中其中有板状态是'{StockStatusEnum.齐包待出库.ToString()}'，不允许强制出库");
            }

            //更新状态 
            foreach (var quan in quanList)
            {
                quan.StockStatus = StockStatusEnum.人工强制待出库;
                quan.UpdateTime = DateTime.Now;
                quan.OperReason = "人工强制待出库";
            }
            updateQuanList.AddRange(quanList);
        }

        await _wmsStockQuanRep.UpdateRangeAsync(updateQuanList);

    }


}


 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/Dto/ForceOutboundInput.cs

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

namespace Admin.NET.Application;

/// <summary>
/// å¼ºåˆ¶å‡ºåº“输入参数
/// </summary>
public class ForceOutboundInput
{

    /// <summary>
    /// åŒ…装号集合
    /// </summary>
    public virtual List<string> PackageCodeList { get; set; }

}