222

schangxiang@126.com

2024-12-13 c2d6e0a51f9e47e04a7a24a06141e4414d0ea418

222

 CC/iWareCC_ASRS/ThreadService/03_BZ12(»úÆ÷ÈËÂë°ü¹¤Î»)/1¡¢DataProcess_BZ12.cs

@@ -117,64 +117,77 @@
                                //查处这包所有的数量
                                var upiList = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == upiObj.PackageCode).ToList();
                                //查询是否末板并且判断有没有混批
                                var wms_rbline_runmode = wmsDB.wms_rbline_runmode.FirstOrDefault();
                                if (wms_rbline_runmode != null)
                                //增加对参数配置的管理 ã€Editby shaocx,2024-12-13】
                                var sysConfig = wmsDB.SysConfig.Where(x => x.Code == "LastPalletizingData").FirstOrDefault();
                                if (sysConfig == null)
                                {
                                    //查询是否混批
                                    if (!string.IsNullOrEmpty(wms_rbline_runmode.PalletizingUPI))
                                    {
                                        if (upiObj.PackageCode != wms_rbline_runmode.PalletizingUPI)
                                        {
                                            //写入报警信息
                                            await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_4);

                                            SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}码包部件混批 ";
                                            continue;
                                        }
                                    }
                                    //获取码垛目标位
                                    if (wms_rbline_runmode.PalletizingStation != 0)
                                    {
                                        place = wms_rbline_runmode.PalletizingStation.ToString();
                                    }
                                    else
                                    {//表示这是 åŒ…的第一块板
                                        lastnum = 1;
                                        wms_rbline_runmode.PalletizingUPI = upiObj.PackageCode;
                                        if (obj.R_PalletizingStation1 == 1)
                                        {
                                            place = "1";
                                        }
                                        else if (obj.R_PalletizingStation2 == 1)
                                        {
                                            place = "2";

                                        }
                                        else
                                        {
                                            //写入报警信息
                                            await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_6);

                                            SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}无可用码垛目标位 ";
                                            continue;
                                        }

                                        wms_rbline_runmode.PalletizingStation = int.Parse(place);
                                    }
                                    //如果次序等于当钱包总数量，是否末板置为true
                                    if (upiObj.Shelf == upiList.Count())
                                    {
                                        lastnum = 2;
                                        wms_rbline_runmode.PalletizingUPI = null;
                                        wms_rbline_runmode.PalletizingStation = 0;
                                    }

                                }
                                else
                                {
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},表wms_rbline_runmode无数据 ";
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"没有获取到 LastPalletizingData çš„配置信息 ";
                                    continue;
                                }
                                string palletizingUPI = "";
                                int palletizingStation = 0;

                                var config_value = sysConfig.Value;
                                if (config_value.IndexOf('|') > -1)
                                {//格式为 åŒ…装号|站点
                                    var arr = config_value.Split('|');
                                    palletizingUPI = arr[0];
                                    palletizingStation = Convert.ToInt32(arr[1]);
                                }
                                else
                                {//表示还没有配置 
                                }

                                //查询是否混批
                                if (!string.IsNullOrEmpty(palletizingUPI))
                                {
                                    if (upiObj.PackageCode != palletizingUPI)
                                    {
                                        //写入报警信息
                                        await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_4);

                                        SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}码包部件混批 ";
                                        continue;
                                    }
                                }
                                //获取码垛目标位
                                if (palletizingStation != 0)
                                {
                                    place = palletizingStation.ToString();
                                }
                                else
                                {//表示这是 åŒ…的第一块板
                                    lastnum = 1;
                                    palletizingUPI = upiObj.PackageCode;
                                    if (obj.R_PalletizingStation1 == 1)
                                    {
                                        place = "1";
                                    }
                                    else if (obj.R_PalletizingStation2 == 1)
                                    {
                                        place = "2";

                                    }
                                    else
                                    {
                                        //写入报警信息
                                        await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_6);

                                        SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}无可用码垛目标位 ";
                                        continue;
                                    }

                                    palletizingStation = int.Parse(place);
                                }
                                //如果次序等于当钱包总数量，是否末板置为true
                                if (upiObj.Shelf == upiList.Count())
                                {
                                    lastnum = 2;
                                    palletizingUPI = null;
                                    palletizingStation = 0;
                                }


                                //查询有没有次序小于当前次序并且没有码垛的
                                var oldupi = upiList.Where(x => x.Shelf < upiObj.Shelf && (x.UpiStatus != (int)UpiStatusEnum.已码垛 && x.UpiStatus != (int)UpiStatusEnum.码垛中)).FirstOrDefault();
                                if (oldupi != null)
@@ -220,7 +233,8 @@

                                wmsDB.wms_rbline_task.Add(task);


                                //更新配置
                                sysConfig.Value = palletizingUPI + "|" + palletizingStation;


                                WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ12站点", "码包");

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

@@ -50,27 +50,6 @@
                        </el-form-item>
                        
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="运行模式名称" prop="lineRunModeName">
                            <el-input v-model="ruleForm.lineRunModeName" 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="palletizingUPI">
                            <el-input v-model="ruleForm.palletizingUPI" 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="palletizingStation">
                            <el-input-number v-model="ruleForm.palletizingStation" placeholder="请输入上一次码垛站点" clearable />
							
                        </el-form-item>
						
                    </el-col>
                </el-row>
            </el-form>
            <template #footer>

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsRbLineRunMode/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="queryParamsWmsRbLineRunMode.searchKey" clearable="" placeholder="BZ01处理的板件,BZ01处理的批次号,BZ01处理的订单号,BZ01处理的包装号,运行模式名称,创建人,修改人,上一次码垛板件"/>
              <el-input v-model="queryParamsWmsRbLineRunMode.searchKey" clearable="" placeholder="BZ01处理的板件,BZ01处理的批次号,BZ01处理的订单号,BZ01处理的包装号,创建人,修改人"/>
              
            </el-form-item>
          </el-col>
@@ -39,24 +39,6 @@
                <el-option v-for="(item,index) in getEnumLineRunModeData_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="showAdvanceQueryUIWmsRbLineRunMode">
            <el-form-item label="运行模式名称">
              <el-input v-model="queryParamsWmsRbLineRunMode.lineRunModeName" clearable="" placeholder="请输入运行模式名称"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRbLineRunMode">
            <el-form-item label="上一次码垛板件">
              <el-input v-model="queryParamsWmsRbLineRunMode.palletizingUPI" clearable="" placeholder="请输入上一次码垛板件"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRbLineRunMode">
            <el-form-item label="上一次码垛站点">
              <el-input-number v-model="queryParamsWmsRbLineRunMode.palletizingStation"  clearable="" placeholder="请输入上一次码垛站点"/>
              
            </el-form-item>
          </el-col>
@@ -95,13 +77,10 @@
              <el-tag>{{ getEnumDesc(scope.row.lineRunMode, getEnumLineRunModeData_Index)}}</el-tag>
            </template>
          </el-table-column>
        <el-table-column prop="lineRunModeName" 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="" />
        <el-table-column prop="updateUserName" label="修改人"  show-overflow-tooltip="" />
        <el-table-column prop="palletizingUPI" label="上一次码垛板件"  show-overflow-tooltip="" />
        <el-table-column prop="palletizingStation" label="上一次码垛站点"  show-overflow-tooltip="" />
        <el-table-column label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('wmsRbLineRunMode:update') || auth('wmsRbLineRunMode:delete')">
          <template #default="scope">
            <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditWmsRbLineRunMode(scope.row)" v-auth="'wmsRbLineRunMode:update'"> ç¼–辑 </el-button>

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsTask/WmsRbLineRunMode.cs

@@ -54,7 +54,7 @@
        public string? LineRunModeName { get; set; }

        /// <summary>
        /// ä¸Šä¸€æ¬¡ç åž›ç¼–号
        /// ä¸Šä¸€æ¬¡ç åž›åŒ…装号
        /// </summary>
        [SugarColumn(ColumnName = "PalletizingUPI", ColumnDescription = "上一次码垛包装号", Length = 50)]
        public string? PalletizingUPI { get; set; }

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/WmsRbLineRunMode/Dto/WmsRbLineRunModeInput.cs

@@ -120,21 +120,6 @@
        /// </summary>
        public Admin.NET.Application.RbRunModeEnum? LineRunMode { get; set; }
        
        /// <summary>
        /// è¿è¡Œæ¨¡å¼åç§°
        /// </summary>
        public string? LineRunModeName { get; set; }
        
        /// <summary>
        /// ä¸Šä¸€æ¬¡ç åž›æ¿ä»¶
        /// </summary>
        public string? PalletizingUPI { get; set; }
        
        /// <summary>
        /// ä¸Šä¸€æ¬¡ç åž›ç«™ç‚¹
        /// </summary>
        public int? PalletizingStation { get; set; }
        
    }

    /// <summary>

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/WmsRbLineRunMode/WmsRbLineRunModeService.cs

@@ -130,19 +130,14 @@
                || u.PlanNo.Contains(input.SearchKey.Trim())
                || u.OrderId.Contains(input.SearchKey.Trim())
                || u.PackageCode.Contains(input.SearchKey.Trim())
                || u.LineRunModeName.Contains(input.SearchKey.Trim())
                || u.CreateUserName.Contains(input.SearchKey.Trim())
                || u.UpdateUserName.Contains(input.SearchKey.Trim())
                || u.PalletizingUPI.Contains(input.SearchKey.Trim())
            )
            .WhereIF(!string.IsNullOrWhiteSpace(input.UPI), u => u.UPI.Contains(input.UPI.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.PlanNo), u => u.PlanNo.Contains(input.PlanNo.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId.Contains(input.OrderId.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
            .WhereIF(input.LineRunMode.HasValue, u => u.LineRunMode == input.LineRunMode)
            .WhereIF(!string.IsNullOrWhiteSpace(input.LineRunModeName), u => u.LineRunModeName.Contains(input.LineRunModeName.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.PalletizingUPI), u => u.PalletizingUPI.Contains(input.PalletizingUPI.Trim()))
            .WhereIF(input.PalletizingStation>0, u => u.PalletizingStation == input.PalletizingStation)
            .Select<WmsRbLineRunModeOutput>();
        return query;
       }