222

schangxiang@126.com

2024-11-30 88215726317c5f095b61c8d5306411e895cb0775

222

 CC/iWareCC_ASRS/ThreadService/05_BZ30(ÆëÌ×ÑéÖ¤)/DataProcess_ValidateQiTao.cs

@@ -55,6 +55,7 @@
                            var configValues = configValue.Split('|');
                            var packageCode = configValues[0];
                            var qitaoValue = configValues[1];//齐套  ä¸é½å¥—
                            var _UnlinePerson = configValues[2];
                            bool iscomplete = false;
                            if (qitaoValue.Equals("齐套"))
                            {
@@ -144,6 +145,8 @@
                            if (order.PackageNum == order.UnLinePackageNum)
                            {
                                order.IsUnline = true;
                                order.UnlineTime = DateTime.Now;
                                order.UnlinePerson = _UnlinePerson;
                            }
                            else
                            {

 CC/iWareSql/WmsDBModel/mes_order_gather.cs

@@ -26,6 +26,10 @@

        public bool? IsUnline { get; set; }

        public DateTime? UnlineTime { get; set; }

        public string? UnlinePerson { get; set; }

        public int PackageNum { get; set; }

        public int UnLinePackageNum { get; set; }

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/component/editDialog.vue

@@ -48,6 +48,20 @@
                        
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="下线时间" prop="unlineTime">
                            <el-date-picker v-model="ruleForm.unlineTime" type="date" placeholder="下线时间" />
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="下线人" prop="unlinePerson">
                            <el-input v-model="ruleForm.unlinePerson" placeholder="请输入下线人" maxlength="50" show-word-limit clearable />
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="包数" prop="packageNum">
                            <el-input-number v-model="ruleForm.packageNum" placeholder="请输入包数" clearable />
                            

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue

@@ -5,7 +5,7 @@
        <el-row>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
            <el-form-item label="关键字">
              <el-input v-model="queryParamsMes_Order_Gather.searchKey" clearable="" placeholder="生产单号,批次号,订单号,创建人,修改人"/>
              <el-input v-model="queryParamsMes_Order_Gather.searchKey" clearable="" placeholder="生产单号,批次号,订单号,下线人,创建人,修改人"/>
              
            </el-form-item>
          </el-col>
@@ -42,6 +42,18 @@
                <el-option v-for="(item,index) in getEnumIsUnlineData_Index" :key="index" :value="item.value" :label="`${item.describe}`" />
                
              </el-select>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
            <el-form-item label="下线时间">
              <el-date-picker placeholder="请选择下线时间" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsMes_Order_Gather.unlineTimeRange" />
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
            <el-form-item label="下线人">
              <el-input v-model="queryParamsMes_Order_Gather.unlinePerson" clearable="" placeholder="请输入下线人"/>
              
            </el-form-item>
          </el-col>
@@ -127,6 +139,8 @@
          </template>
          
        </el-table-column>
         <el-table-column prop="unlineTime" label="下线时间" width="80" :formatter="formatDate_T_Date"  show-overflow-tooltip="" />
        <el-table-column prop="unlinePerson" label="下线人"  show-overflow-tooltip="" />
        <el-table-column prop="packageNum" label="包数"  show-overflow-tooltip="" />
        <el-table-column prop="unLinePackageNum" label="已下线包数"  show-overflow-tooltip="" />
        <el-table-column prop="noUnLinePackageNum" label="未下线包数"  show-overflow-tooltip="" />

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

@@ -42,6 +42,18 @@
        [SugarColumn(ColumnName = "IsUnline", ColumnDescription = "是否下线")]
        public bool? IsUnline { get; set; }

        /// <summary>
        /// ä¸‹çº¿æ—¶é—´
        /// </summary>
        [SugarColumn(ColumnName = "UnlineTime", ColumnDescription = "下线时间")]
        public DateTime? UnlineTime { get; set; }

        /// <summary>
        /// ä¸‹çº¿äºº
        /// </summary>
        [SugarColumn(ColumnName = "UnlinePerson", ColumnDescription = "下线人", Length = 50)]
        public string? UnlinePerson { get; set; }


        /// <summary>
        /// åŒ…æ•°

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

@@ -7,6 +7,7 @@
using DocumentFormat.OpenXml.Office.CustomUI;
using Microsoft.CodeAnalysis.Operations;
using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
using Furion.DatabaseAccessor;

namespace Admin.NET.Application;
/// <summary>
@@ -21,6 +22,7 @@
    private readonly SqlSugarRepository<SysConfig> _sysConfigRep;
    private readonly SqlSugarRepository<Mes_BatchOrderUPI_New> _mesBatchOrderUpiRep;
    private readonly SqlSugarRepository<Mes_Order_Gather> _mesOrderGatherRep;


    public WmsOperationTaskService(SqlSugarRepository<WmsRbLineTask> rep, SqlSugarRepository<WmsStockQuan> wmsStockQuanRep
        , SqlSugarRepository<Mes_Package_Gather> mesPackageGatherRep
@@ -85,6 +87,7 @@
    [HttpPost]
    [ApiDescriptionSettings(Name = "ValdateQiTao")]
    [Description("WmsOperationTask/ValdateQiTao")]
    [UnitOfWork]
    public async Task<ValidateQiTaoOutput> ValdateQiTao(ValidateQiTaoInput input)
    {
        ValidateQiTaoOutput output = new ValidateQiTaoOutput();
@@ -111,6 +114,9 @@
            throw Oops.Oh($"判断齐套值已经存在值{sysConfig.Value},不允许操作");
        }

        //记录工作时间和工作人
        var curUserName = App.User.FindFirst(ClaimConst.RealName)?.Value;

        var setValue = "";
        var _QiTaoReuslt = "";
        var other_orderList = await _mesPackageGatherRep.AsQueryable().Where(x => x.Info5 == package.Info5 && x.PackageCode != input.PackageCode).ToListAsync();
@@ -118,12 +124,12 @@
        if (num > 0)
        {
            //不齐套
            setValue = $"{input.PackageCode}|不齐套";
            setValue = $"{input.PackageCode}|不齐套|" + curUserName;
            _QiTaoReuslt = "不齐套";
        }
        else
        {
            setValue = $"{input.PackageCode}|齐套";
            setValue = $"{input.PackageCode}|齐套|" + curUserName;
            _QiTaoReuslt = "齐套";
        }

@@ -132,7 +138,25 @@
        sysConfig.Value = setValue;
        await _sysConfigRep.UpdateAsync(sysConfig);

        //记录工作时间和工作人

        var sysConfig_wms_unline_oper = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.wms_unline_oper);
        if (sysConfig_wms_unline_oper == null)
        {
            throw Oops.Oh($"没有配置 åŒ…装下线操作人 å€¼");
        }
        if (sysConfig_wms_unline_oper.Value != curUserName)
        {
            sysConfig_wms_unline_oper.Value = curUserName;
            await _sysConfigRep.UpdateAsync(sysConfig_wms_unline_oper);

            var sysConfig_wms_unline_time = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.wms_unline_time);
            if (sysConfig_wms_unline_time == null)
            {
                throw Oops.Oh($"没有配置 åŒ…装下线登陆时间 å€¼");
            }
            sysConfig_wms_unline_time.Value = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
            await _sysConfigRep.UpdateAsync(sysConfig_wms_unline_time);
        }


        output = package.Adapt<ValidateQiTaoOutput>();

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherInput.cs

@@ -34,6 +34,16 @@
        public virtual bool? IsUnline { get; set; }
        
        /// <summary>
        /// ä¸‹çº¿æ—¶é—´
        /// </summary>
        public virtual DateTime? UnlineTime { get; set; }
        
        /// <summary>
        /// ä¸‹çº¿äºº
        /// </summary>
        public virtual string UnlinePerson { get; set; }
        
        /// <summary>
        /// åŒ…æ•°
        /// </summary>
        public virtual int PackageNum { get; set; }
@@ -136,6 +146,20 @@
        public bool? IsUnline { get; set; }
        
        /// <summary>
        /// ä¸‹çº¿æ—¶é—´
        /// </summary>
        public DateTime? UnlineTime { get; set; }
        
        /// <summary>
         /// ä¸‹çº¿æ—¶é—´èŒƒå›´
         /// </summary>
         public List<DateTime?> UnlineTimeRange { get; set; } 
        /// <summary>
        /// ä¸‹çº¿äºº
        /// </summary>
        public string? UnlinePerson { get; set; }
        
        /// <summary>
        /// åŒ…æ•°
        /// </summary>
        public int? PackageNum { get; set; }

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherOutput.cs

@@ -36,6 +36,16 @@
    public bool? IsUnline { get; set; }
    
    /// <summary>
    /// ä¸‹çº¿æ—¶é—´
    /// </summary>
    public DateTime? UnlineTime { get; set; }
    
    /// <summary>
    /// ä¸‹çº¿äºº
    /// </summary>
    public string UnlinePerson { get; set; }
    
    /// <summary>
    /// åŒ…æ•°
    /// </summary>
    public int PackageNum { get; set; }

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs

@@ -129,6 +129,7 @@
                u.Info5.Contains(input.SearchKey.Trim())
                || u.PlanNo.Contains(input.SearchKey.Trim())
                || u.OrderId.Contains(input.SearchKey.Trim())
                || u.UnlinePerson.Contains(input.SearchKey.Trim())
                || u.CreateUserName.Contains(input.SearchKey.Trim())
                || u.UpdateUserName.Contains(input.SearchKey.Trim())
            )
@@ -137,10 +138,21 @@
            .WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId.Contains(input.OrderId.Trim()))
            .WhereIF(input.IsKitting.HasValue, u => u.IsKitting == input.IsKitting)
            .WhereIF(input.IsUnline.HasValue, u => u.IsUnline == input.IsUnline)
            .WhereIF(!string.IsNullOrWhiteSpace(input.UnlinePerson), u => u.UnlinePerson.Contains(input.UnlinePerson.Trim()))
            .WhereIF(input.PackageNum>0, u => u.PackageNum == input.PackageNum)
            .WhereIF(input.UnLinePackageNum>0, u => u.UnLinePackageNum == input.UnLinePackageNum)
            .WhereIF(input.NoUnLinePackageNum>0, u => u.NoUnLinePackageNum == input.NoUnLinePackageNum)
            .Select<Mes_Order_GatherOutput>();
        if(input.UnlineTimeRange != null && input.UnlineTimeRange.Count >0)
        {
            DateTime? start= input.UnlineTimeRange[0].Value.AddDays(-1);
            query = query.WhereIF(start.HasValue, u => u.UnlineTime > start);
            if (input.UnlineTimeRange.Count >1 && input.UnlineTimeRange[1].HasValue)
            {
                var end = input.UnlineTimeRange[1].Value.AddDays(1);
                query = query.Where(u => u.UnlineTime < end);
            }
        } 
        return query;
       }


 LA24030_LuLiPackageLine_Wms/Admin.NET.Core/Const/CommonConst.cs

@@ -105,6 +105,17 @@


    /// <summary>
    /// åŒ…装下线操作人 ã€Editby shaocx,2024-11-28】
    /// </summary>
    public const string wms_unline_oper = "wms_unline_oper";

    /// <summary>
    /// åŒ…装下线登陆时间 ã€Editby shaocx,2024-11-28】
    /// </summary>
    public const string wms_unline_time = "wms_unline_time";


    /// <summary>
    /// é»˜è®¤çš„ERP库存地
    /// </summary>
    public const string DefaultErpCode = "default_erpCode";