将很快

schangxiang@126.com

2024-12-03 a5acf83d77d56723125d8bdbe06e03db16a7c38d

将很快

 CC/iWareCC_ASRS/ThreadService/04_BZ21£¨°áÔËÕû¶â»úÆ÷ÈË£©/1¡¢DataProcess_BZ21.cs

@@ -78,12 +78,21 @@
                            using (WmsDBModel wmsDB = new WmsDBModel())
                            {
                                //要是有已下发的任务，就不要执行
                                var isValidate = TaskHandler.ValidateIssueTaskForBZ21(wmsDB, result);
                                var isValidate = TaskHandler.ValidateIssueTaskForNoFinishTaskByUpi(wmsDB, result);
                                if (!isValidate)
                                {
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}-有‘已下发’的任务，不能处理,此次循环结束";
                                    continue;
                                }

                                //增加校验，如果上一个任务upi跟本次upi一致，就报错 ã€Editby shaocx,2024-12-03】
                                var lastTask = wmsDB.wms_rbline_task.Where(x => x.RbTaskType == (int)RbTaskTypeEnum.合包任务).OrderByDescending(x => x.Id).FirstOrDefault();
                                if (lastTask != null && lastTask.UPI == result)
                                {
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}-PLC重发此任务，upi：{result}，系统不能重复处理,此次循环结束";
                                    continue;
                                }

                                var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == result).FirstOrDefault();
                                if (upiObj == null)
                                {
@@ -95,7 +104,7 @@
                                var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
                                papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                                papercut.ApiMessage = "";
                                papercut.PushNum = 1;
                                papercut.PushNum = 0;
                                papercut.PushStatus = (int)PushStatusEnum.NotPush;
                                papercut.CreateTime = papercut.UpdateTime = DateTime.Now;
                                wmsDB.mes_push_papercut.Add(papercut);
@@ -128,12 +137,12 @@
                                    PackageCode = upiObj.PackageCode,
                                    PushStatus = 0,
                                    PushNum = 0,
                                    ApiMessage = "待推送",
                                    ApiMessage = "",
                                    CreateTime = DateTime.Now,
                                    CreateUserName = "CC",
                                    UpdateTime = DateTime.Now,
                                    UpdateUserName = "CC",
                                    CreateOrgName = "11"

                                };
                                //新增任务表
                                var task = new wms_rbline_task()

 CC/iWareCC_ASRS/ThreadService/04_BZ21£¨°áÔËÕû¶â»úÆ÷ÈË£©/3¡¢DataProcess_BZ21_FinishTask.cs

@@ -77,6 +77,7 @@
                                    foreach (var item in upiobj)
                                    {
                                        item.UpiStatus = (int)UpiStatusEnum.已合包;
                                        item.AreaCode = (int)AreaCodeEnum.包装线区域;
                                    }
                                }
                                task.TaskStatus = (int)TaskStatusEnum.已完成;

 CC/iWareCC_ASRS/WmsTask/PushPackageCodeToMes.cs

@@ -45,14 +45,15 @@
                                value.UpdateTime = DateTime.Now;
                                if (res.iState == 0)
                                {
                                    value.PushNum++;
                                    value.PushStatus = (int)PushStatusEnum.PushSuccess;
                                    value.ApiMessage = res.message;
                                    value.ApiMessage = (res.message ?? "") + (res.errorMessage ?? "");
                                }
                                else
                                {
                                    value.PushStatus = (int)PushStatusEnum.Pushing;
                                    value.PushNum++;
                                    value.ApiMessage += res.message;
                                    value.ApiMessage = (res.message ?? "") + (res.errorMessage ?? "");
                                    if (value.PushNum == 3)
                                    {
                                        value.PushStatus = (int)PushStatusEnum.PushFail;

 CC/iWareCC_ASRS/WmsTask/PushPaperCutToMes.cs

@@ -45,14 +45,15 @@
                                value.UpdateTime = DateTime.Now;
                                if (res.iState == 0)
                                {
                                    value.PushNum++;
                                    value.PushStatus = (int)PushStatusEnum.PushSuccess;
                                    value.ApiMessage = res.message;
                                    value.ApiMessage = (res.message ?? "") + (res.errorMessage ?? "");
                                }
                                else
                                {
                                    value.PushStatus = (int)PushStatusEnum.Pushing;
                                    value.PushNum++;
                                    value.ApiMessage += res.message;
                                    value.ApiMessage = (res.message ?? "") + (res.errorMessage ?? "");
                                    if (value.PushNum == 3)
                                    {
                                        value.PushStatus = (int)PushStatusEnum.PushFail;

 CC/iWareModel/Entity/MES/Respone.cs

@@ -19,6 +19,11 @@
        public string message { get; set; }

        /// <summary>
        /// è¿”回消息
        /// </summary>
        public string errorMessage { get; set; }

        /// <summary>
        /// è‡ªå®šä¹‰è¿”回
        /// </summary>
        public string data { get; set; }

 CC/iWareSql/WmsDBModel/mes_push_packagecode.cs

@@ -21,15 +21,7 @@

        public int PushNum { get; set; }

        [Required]
        [StringLength(50)]
        public string ApiMessage { get; set; }

        public long? CreateOrgId { get; set; }

        [Required]
        [StringLength(64)]
        public string CreateOrgName { get; set; }

        public DateTime? CreateTime { get; set; }


 CC/iWareSql/WmsDBModel/mes_push_papercut.cs

@@ -21,8 +21,6 @@

        public int PushNum { get; set; }

        [Required]
        [StringLength(50)]
        public string ApiMessage { get; set; }

        public DateTime? CreateTime { get; set; }
@@ -40,11 +38,5 @@
        public string UpdateUserName { get; set; }

        public bool IsDelete { get; set; }

        public double? Info1 { get; set; }

        public double? Info2 { get; set; }

        public double? Info3 { get; set; }
    }
}

 CC/iWareSql/WmsDBModel/wms_rbline_task.cs

@@ -46,8 +46,6 @@

        public int? RbTaskType { get; set; }

        public int? LastNum { get; set; }

        [StringLength(50)]
        public string RbTaskTypeEnumName { get; set; }

@@ -84,5 +82,7 @@
        public string UpdateUserName { get; set; }

        public bool IsDelete { get; set; }

        public int? LastNum { get; set; }
    }
}

 LA24030_LuLiPackageLine_Web/public/config.js

 LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue

@@ -45,14 +45,7 @@
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="接口返回参数" prop="apiMessage">
                            <el-input v-model="ruleForm.apiMessage" 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="createOrgName">
                            <el-input v-model="ruleForm.createOrgName" placeholder="请输入创建者部门名称" maxlength="64" show-word-limit clearable />
                            <el-input v-model="ruleForm.apiMessage" placeholder="请输入接口返回参数" maxlength="-1" show-word-limit clearable />
                            
                        </el-form-item>
                        
@@ -103,8 +96,6 @@
        packageCode: [{required: true, message: '请输入包装号！', trigger: 'blur',},],
        pushStatus: [{required: true, message: '请选择推送状态！', trigger: 'change',},],
        pushNum: [{required: true, message: '请输入推送次数！', trigger: 'blur',},],
        apiMessage: [{required: true, message: '请输入接口返回参数！', trigger: 'blur',},],
        createOrgName: [{required: true, message: '请输入创建者部门名称！', trigger: 'blur',},],
        isDelete: [{required: true, message: '请选择软删除！', trigger: 'change',},],
    });


 LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/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="queryParamsMesPushPackageCode.searchKey" clearable="" placeholder="包装号,接口返回参数,创建者部门名称,创建人,修改人"/>
              <el-input v-model="queryParamsMesPushPackageCode.searchKey" clearable="" placeholder="包装号,接口返回参数,创建人,修改人"/>
              
            </el-form-item>
          </el-col>
@@ -39,12 +39,6 @@
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
            <el-form-item label="接口返回参数">
              <el-input v-model="queryParamsMesPushPackageCode.apiMessage" clearable="" placeholder="请输入接口返回参数"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
            <el-form-item label="创建者部门名称">
              <el-input v-model="queryParamsMesPushPackageCode.createOrgName" clearable="" placeholder="请输入创建者部门名称"/>
              
            </el-form-item>
          </el-col>
@@ -84,7 +78,6 @@
         <el-table-column prop="pushTime" label="推送时间" width="80" :formatter="formatDate_T_Date"  show-overflow-tooltip="" />
        <el-table-column prop="pushNum" label="推送次数"  show-overflow-tooltip="" />
        <el-table-column prop="apiMessage" label="接口返回参数"  show-overflow-tooltip="" />
        <el-table-column prop="createOrgName" label="创建者部门名称"  show-overflow-tooltip="" />
         <el-table-column prop="createTime" label="创建时间" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
         <el-table-column prop="updateTime" label="修改时间" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
        <el-table-column prop="createUserName" label="创建人"  show-overflow-tooltip="" />

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

@@ -33,12 +33,6 @@
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
            <el-form-item label="创建者部门名称">
              <el-input v-model="queryParamsMesPushPackageCode.createOrgName" clearable="" placeholder="请输入创建者部门名称"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb10">
            <el-form-item>
              <el-button-group style="display: flex; align-items: center;">
@@ -75,7 +69,6 @@
         <el-table-column prop="updateTime" label="修改时间" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
        <el-table-column prop="createUserName" label="创建人"  show-overflow-tooltip="" />
        <el-table-column prop="updateUserName" label="修改人"  show-overflow-tooltip="" />
        <el-table-column prop="createOrgName" label="创建者部门名称"  show-overflow-tooltip="" />
        <el-table-column label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('mesPushPackageCode:update') || auth('mesPushPackageCode:delete')">
          <template #default="scope">
            <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMesPushPackageCode(scope.row)" v-auth="'mesPushPackageCode:update'"> ç¼–辑 </el-button>

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

@@ -40,19 +40,7 @@
    /// <summary>
    /// æŽ¥å£è¿”回参数
    /// </summary>
    [SugarColumn(ColumnName = "ApiMessage", ColumnDescription = "接口返回参数", Length = 50)]
    public string ApiMessage { get; set; }

    /// <summary>
    /// åˆ›å»ºè€…部门Id
    /// </summary>
    [SugarColumn(ColumnName = "CreateOrgId", ColumnDescription = "创建者部门Id")]
    public long? CreateOrgId { get; set; }

    /// <summary>
    /// åˆ›å»ºè€…部门名称
    /// </summary>
    [SugarColumn(ColumnName = "CreateOrgName", ColumnDescription = "创建者部门名称", Length = 64)]
    public string CreateOrgName { get; set; }
    [SugarColumn(ColumnName = "ApiMessage", ColumnDescription = "接口返回参数", Length = 5000)]
    public string? ApiMessage { get; set; }

}

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

@@ -47,7 +47,7 @@
    /// <summary>
    /// æŽ¥å£è¿”回参数
    /// </summary>
    [SugarColumn(ColumnName = "ApiMessage", ColumnDescription = "接口返回参数", Length = 50)]
    public string ApiMessage { get; set; }
    [SugarColumn(ColumnName = "ApiMessage", ColumnDescription = "接口返回参数", Length = 5000)]
    public string? ApiMessage { get; set; }

}

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

@@ -34,16 +34,6 @@
        public virtual string ApiMessage { get; set; }
        
        /// <summary>
        /// åˆ›å»ºè€…部门Id
        /// </summary>
        public virtual long? CreateOrgId { get; set; }
        
        /// <summary>
        /// åˆ›å»ºè€…部门名称
        /// </summary>
        public virtual string CreateOrgName { get; set; }
        
        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        public virtual DateTime? CreateTime { get; set; }
@@ -119,11 +109,6 @@
        /// </summary>
        public string? ApiMessage { get; set; }
        
        /// <summary>
        /// åˆ›å»ºè€…部门名称
        /// </summary>
        public string? CreateOrgName { get; set; }
        
    }

    /// <summary>
@@ -148,18 +133,6 @@
        /// </summary>
        [Required(ErrorMessage = "推送次数不能为空")]
        public override int PushNum { get; set; }
        
        /// <summary>
        /// æŽ¥å£è¿”回参数
        /// </summary>
        [Required(ErrorMessage = "接口返回参数不能为空")]
        public override string ApiMessage { get; set; }
        
        /// <summary>
        /// åˆ›å»ºè€…部门名称
        /// </summary>
        [Required(ErrorMessage = "创建者部门名称不能为空")]
        public override string CreateOrgName { get; set; }
        
        /// <summary>
        /// è½¯åˆ é™¤

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

@@ -36,16 +36,6 @@
    public string ApiMessage { get; set; }
    
    /// <summary>
    /// åˆ›å»ºè€…部门Id
    /// </summary>
    public long? CreateOrgId { get; set; }
    
    /// <summary>
    /// åˆ›å»ºè€…部门名称
    /// </summary>
    public string CreateOrgName { get; set; }
    
    /// <summary>
    /// åˆ›å»ºæ—¶é—´
    /// </summary>
    public DateTime? CreateTime { get; set; }

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

@@ -128,7 +128,6 @@
            .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
                u.PackageCode.Contains(input.SearchKey.Trim())
                || u.ApiMessage.Contains(input.SearchKey.Trim())
                || u.CreateOrgName.Contains(input.SearchKey.Trim())
                || u.CreateUserName.Contains(input.SearchKey.Trim())
                || u.UpdateUserName.Contains(input.SearchKey.Trim())
            )
@@ -136,7 +135,6 @@
            .WhereIF(input.PushStatus.HasValue, u => u.PushStatus == input.PushStatus)
            .WhereIF(input.PushNum>0, u => u.PushNum == input.PushNum)
            .WhereIF(!string.IsNullOrWhiteSpace(input.ApiMessage), u => u.ApiMessage.Contains(input.ApiMessage.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.CreateOrgName), u => u.CreateOrgName.Contains(input.CreateOrgName.Trim()))
            .Select<MesPushPackageCodeOutput>();
        if(input.PushTimeRange != null && input.PushTimeRange.Count >0)
        {