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

liuying

2024-11-28 6c5a7bd1a9342d8e6792773aef3d62588a60714d

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

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

@@ -92,6 +92,7 @@
                                    continue;
                                }
                                upiObj.UpiStatus = (int)UpiStatusEnum.码垛中;
                                upiObj.AreaCode = (int)AreaCodeEnum.码垛区域;
                                //查处这包所有的数量
                                var upiList = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == upiObj.PackageCode).ToList();
                                //查询是否末板并且判断有没有混批

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

@@ -62,16 +62,13 @@
                                continue;
                            }
                            var upiCode = result.Replace("/r", ""); ;
                            short cartonwidth = 0;//是否末板
                            short cartonhigh = 0;//是否旋转
                            short placeX = 0;
                            short placeY = 0;
                            short placeZ = 0;
                            short cartonwidth = 0;//纸箱宽
                            short cartonhigh = 0;//纸箱高
                            string place = "22";
                            using (WmsDBModel wmsDB = new WmsDBModel())
                            {
                                //要是有已下发的任务，就不要执行
                                var isValidate = TaskHandler.ValidateIssueTaskForBZ21(wmsDB,result);
                                var isValidate = TaskHandler.ValidateIssueTaskForBZ21(wmsDB, result);
                                if (!isValidate)
                                {
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}-有‘已下发’的任务，不能处理,此次循环结束";
@@ -83,28 +80,35 @@
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()},根据UPI:{upiCode}没有找到对象 ";
                                    continue;
                                }
                                var mesgather = wmsDB.mes_package_gather.Where(x => x.PackageCode == upiObj.PackageCode).FirstOrDefault();
                                if (mesgather != null)
                                {
                                    mesgather.AreaCode = (int)AreaCodeEnum.合包裁切区;
                                    mesgather.UpiStatus = (int)UpiStatusEnum.已合包;
                                }

                                placeX = (short)upiObj.MachineXCenter;
                                placeY = (short)upiObj.MachineYCenter;
                                placeZ = (short)upiObj.MachineZCenter;
                                cartonhigh = (short)upiObj.Info3;
                                cartonwidth = (short)upiObj.Info2;

                                upiObj.UpiStatus = (int)UpiStatusEnum.已合包;
                                upiObj.AreaCode = (int)AreaCodeEnum.合包裁切区;
                                //记录任务
                                var _id = Yitter.IdGenerator.YitIdHelper.NextId();
                                var putpakegecodeid = Yitter.IdGenerator.YitIdHelper.NextId();
                                var plcTaskNo = BusinessHelper.CreatePlcTaskIdForSrmTask();
                                var mesinequeue = ClassHelper.RotationMapping<mes_package_linequeue, mes_batchOrderUPI_new>(upiObj);
                                mesinequeue.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                                var putpakegecode = new mes_push_packagecode()
                                {
                                    Id = _id,
                                    PackageCode=upiObj.PackageCode,
                                    PushStatus=0,
                                    PushNum=0,
                                    ApiMessage="11",
                                    Id = putpakegecodeid,
                                    PackageCode = upiObj.PackageCode,
                                    PushStatus = 0,
                                    PushNum = 0,
                                    ApiMessage = "11",
                                    CreateTime = DateTime.Now,
                                    CreateUserName = "CC",
                                    UpdateTime = DateTime.Now,
                                    UpdateUserName = "CC",
                                    CreateOrgName="11"
                                    CreateOrgName = "11"
                                };
                                var task = new wms_rbline_task()
                                {
@@ -129,14 +133,14 @@
                                    UpdateUserName = "CC",
                                    PlaceCode = place
                                };

                                wmsDB.mes_package_linequeue.Add(mesinequeue);
                                wmsDB.wms_rbline_task.Add(task);
                               // wmsDB.mes_push_packagecode.Add(putpakegecode);
                                wmsDB.mes_push_packagecode.Add(putpakegecode);
                                using (StationServiceClient client = new StationServiceClient())
                                {

                                    var res = client.WriteSurroundTaskInfo((int)EDevice.Station, rgvLocation, short.Parse(task.TaskNo), 
                                          (short)upiObj.Length, (short)upiObj.Width,cartonhigh,cartonwidth,placeX,placeY);
                                    var res = client.WriteSurroundTaskInfo((int)EDevice.Station, rgvLocation, short.Parse(task.TaskNo),
                                          (short)upiObj.Length, (short)upiObj.Width, cartonhigh, cartonwidth, 0, 0);
                                    if (!res.result)
                                    {
                                        SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-下发入库任务 å¤±è´¥,WriteInStoreTaskInfoAsync è¿”回:{res.resMsg}";

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

@@ -53,18 +53,30 @@
                                var task = wmsDB.wms_rbline_task.Where(x =>
                                 x.TaskNo == obj.R_SurrouondTaskNo.ToString()
                                && x.RbTaskType == (int)RbTaskTypeEnum.夹板任务
                                && x.TaskStatus == (int)TaskStatusEnum.已下发).FirstOrDefault();
                                ).OrderByDescending(x=>x.Id).FirstOrDefault();
                                if (task == null)
                                {
                                    SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()},根据 R_InboundNumber:{obj.R_InboundNumber}没有找到已下发的任务 ";
                                    continue;
                                }
                                else
                                {
                                    if (task.TaskStatus == (int)TaskStatusEnum.已完成)
                                    {
                                        //给PLC推送任务完成确认信号
                                        using (StationServiceClient client = new StationServiceClient())
                                        {
                                            var res = client.SetSurroundTaskFinishAck((int)EDevice.Station, true, rgvLocation);
                                        }
                                        continue;
                                    }
                                }
                                var upiobj = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == task.PackageCode).ToList();
                                if (upiobj.Count > 0)
                                {
                                    foreach (var item in upiobj)
                                    {
                                        item.UpiStatus = 4;
                                        item.UpiStatus = (int)UpiStatusEnum.已合包;
                                    }
                                }
                                task.TaskStatus = (int)TaskStatusEnum.已完成;

 CC/iWareSql/DataAccess/TaskHandler.cs

@@ -43,7 +43,7 @@
        public static bool ValidateIssueTaskForBZ12(WmsDBModel.WmsDBModel wmsDB,string str)
        {
            var isExist = wmsDB.wms_rbline_task.Where(x => x.TaskStatus == (int)TaskStatusEnum.已下发
                && x.RbTaskType == (int)RbTaskTypeEnum.码板任务).ToList();
                && x.RbTaskType == (int)RbTaskTypeEnum.码板任务 && x.UPI == str).ToList();
            if (isExist?.Count() > 0)
            {
                return false;
@@ -53,7 +53,7 @@
        public static bool ValidateIssueTaskForBZ21(WmsDBModel.WmsDBModel wmsDB,string str)
        {
            var isExist = wmsDB.wms_rbline_task.Where(x => x.TaskStatus == (int)TaskStatusEnum.已下发
                && x.RbTaskType == (int)RbTaskTypeEnum.夹板任务).ToList();
                && x.RbTaskType == (int)RbTaskTypeEnum.夹板任务&&x.UPI==str).ToList();
            if (isExist?.Count() > 0)
            {
                return false;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs

@@ -329,9 +329,15 @@
                        double leijisaomiaomj = 0;
                        foreach (var aa in finsiList)
                        {
                            leijisaomiaomj += Convert.ToDouble(aa.Info13);
                            if (!string.IsNullOrEmpty(aa.Info13))
                            {
                                leijisaomiaomj += Convert.ToDouble(aa.Info13);
                            }
                        }
                        leijisaomiaomj += Convert.ToDouble(item.Info13);
                        if (!string.IsNullOrEmpty(item.Info13))
                        {
                            leijisaomiaomj += Convert.ToDouble(item.Info13);
                        }
                        data.Add("leijisaomiaomj", leijisaomiaomj);//累计扫描面积

                        //查询下 åŒ…数据

 LA24030_LuLiPackageLine_Web/src/api/main/ReportCenter/mes_Package_UnLine_Record.ts

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,78 @@
import request from '/@/utils/request';
enum Api {
  AddMes_Package_UnLine_Record = '/api/mes_Package_UnLine_Record/add',
  DeleteMes_Package_UnLine_Record = '/api/mes_Package_UnLine_Record/delete',
  UpdateMes_Package_UnLine_Record = '/api/mes_Package_UnLine_Record/update',
  PageMes_Package_UnLine_Record = '/api/mes_Package_UnLine_Record/page',
  ListMes_Package_UnLine_Record = '/api/mes_Package_UnLine_Record/list',
  DetailMes_Package_UnLine_Record = '/api/mes_Package_UnLine_Record/detail',
  ImportExcelMes_Package_UnLine_Record = '/api/mes_Package_UnLine_Record/importExcel',
  DownloadExcelTemplateMes_Package_UnLine_Record = '/api/mes_Package_UnLine_Record/downloadExcelTemplate',
}

// å¢žåŠ åŒ…下线记录
export const addMes_Package_UnLine_Record = (params?: any) =>
    request({
        url: Api.AddMes_Package_UnLine_Record,
        method: 'post',
        data: params
    });

// åˆ é™¤åŒ…下线记录
export const deleteMes_Package_UnLine_Record = (params?: any) => 
    request({
            url: Api.DeleteMes_Package_UnLine_Record,
            method: 'post',
            data: params
        });

// ç¼–辑包下线记录
export const updateMes_Package_UnLine_Record = (params?: any) => 
    request({
            url: Api.UpdateMes_Package_UnLine_Record,
            method: 'post',
            data: params
        });

// å¯¼å…¥åŒ…下线记录
export const importExcelMes_Package_UnLine_Record = (params?: any) =>
    request({
        url: Api.ImportExcelMes_Package_UnLine_Record,
        method: 'post',
        data: params
    });

// ä¸‹è½½å¯¼å…¥åŒ…下线记录模板
export const downloadExcelTemplateMes_Package_UnLine_Record = (params?: any) => 
    request({
            url: Api.DownloadExcelTemplateMes_Package_UnLine_Record,
            method: 'get',
            data: params,
            responseType: 'blob'
        });


// åˆ†é¡µæŸ¥è¯¢åŒ…下线记录
export const pageMes_Package_UnLine_Record = (params?: any) => 
    request({
            url: Api.PageMes_Package_UnLine_Record,
            method: 'post',
            data: params
        });

// ä¸åˆ†é¡µæŸ¥è¯¢åŒ…下线记录
export const listMes_Package_UnLine_Record = (params?: any) => 
    request({
            url: Api.ListMes_Package_UnLine_Record,
            method: 'get',
            data: params
        });

// è¯¦æƒ…包下线记录
export const detailMes_Package_UnLine_Record = (id: any) => 
    request({
            url: Api.DetailMes_Package_UnLine_Record,
            method: 'get',
            data: { id }
        });


 LA24030_LuLiPackageLine_Web/src/api/main/ThirdInterFace/mesPushPaperCut.ts

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,78 @@
import request from '/@/utils/request';
enum Api {
  AddMesPushPaperCut = '/api/mesPushPaperCut/add',
  DeleteMesPushPaperCut = '/api/mesPushPaperCut/delete',
  UpdateMesPushPaperCut = '/api/mesPushPaperCut/update',
  PageMesPushPaperCut = '/api/mesPushPaperCut/page',
  ListMesPushPaperCut = '/api/mesPushPaperCut/list',
  DetailMesPushPaperCut = '/api/mesPushPaperCut/detail',
  ImportExcelMesPushPaperCut = '/api/mesPushPaperCut/importExcel',
  DownloadExcelTemplateMesPushPaperCut = '/api/mesPushPaperCut/downloadExcelTemplate',
}

// å¢žåŠ çº¸ç®±æœºå¯¹æŽ¥
export const addMesPushPaperCut = (params?: any) =>
    request({
        url: Api.AddMesPushPaperCut,
        method: 'post',
        data: params
    });

// åˆ é™¤çº¸ç®±æœºå¯¹æŽ¥
export const deleteMesPushPaperCut = (params?: any) => 
    request({
            url: Api.DeleteMesPushPaperCut,
            method: 'post',
            data: params
        });

// ç¼–辑纸箱机对接
export const updateMesPushPaperCut = (params?: any) => 
    request({
            url: Api.UpdateMesPushPaperCut,
            method: 'post',
            data: params
        });

// å¯¼å…¥çº¸ç®±æœºå¯¹æŽ¥
export const importExcelMesPushPaperCut = (params?: any) =>
    request({
        url: Api.ImportExcelMesPushPaperCut,
        method: 'post',
        data: params
    });

// ä¸‹è½½å¯¼å…¥çº¸ç®±æœºå¯¹æŽ¥æ¨¡æ¿
export const downloadExcelTemplateMesPushPaperCut = (params?: any) => 
    request({
            url: Api.DownloadExcelTemplateMesPushPaperCut,
            method: 'get',
            data: params,
            responseType: 'blob'
        });


// åˆ†é¡µæŸ¥è¯¢çº¸ç®±æœºå¯¹æŽ¥
export const pageMesPushPaperCut = (params?: any) => 
    request({
            url: Api.PageMesPushPaperCut,
            method: 'post',
            data: params
        });

// ä¸åˆ†é¡µæŸ¥è¯¢çº¸ç®±æœºå¯¹æŽ¥
export const listMesPushPaperCut = (params?: any) => 
    request({
            url: Api.ListMesPushPaperCut,
            method: 'get',
            data: params
        });

// è¯¦æƒ…纸箱机对接
export const detailMesPushPaperCut = (id: any) => 
    request({
            url: Api.DetailMesPushPaperCut,
            method: 'get',
            data: { id }
        });


 LA24030_LuLiPackageLine_Web/src/api/main/WmsOrder/mes_Package_Gather.ts

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,78 @@
import request from '/@/utils/request';
enum Api {
  AddMes_Package_Gather = '/api/mes_Package_Gather/add',
  DeleteMes_Package_Gather = '/api/mes_Package_Gather/delete',
  UpdateMes_Package_Gather = '/api/mes_Package_Gather/update',
  PageMes_Package_Gather = '/api/mes_Package_Gather/page',
  ListMes_Package_Gather = '/api/mes_Package_Gather/list',
  DetailMes_Package_Gather = '/api/mes_Package_Gather/detail',
  ImportExcelMes_Package_Gather = '/api/mes_Package_Gather/importExcel',
  DownloadExcelTemplateMes_Package_Gather = '/api/mes_Package_Gather/downloadExcelTemplate',
}

// å¢žåŠ åŒ…数据
export const addMes_Package_Gather = (params?: any) =>
    request({
        url: Api.AddMes_Package_Gather,
        method: 'post',
        data: params
    });

// åˆ é™¤åŒ…数据
export const deleteMes_Package_Gather = (params?: any) => 
    request({
            url: Api.DeleteMes_Package_Gather,
            method: 'post',
            data: params
        });

// ç¼–辑包数据
export const updateMes_Package_Gather = (params?: any) => 
    request({
            url: Api.UpdateMes_Package_Gather,
            method: 'post',
            data: params
        });

// å¯¼å…¥åŒ…数据
export const importExcelMes_Package_Gather = (params?: any) =>
    request({
        url: Api.ImportExcelMes_Package_Gather,
        method: 'post',
        data: params
    });

// ä¸‹è½½å¯¼å…¥åŒ…数据模板
export const downloadExcelTemplateMes_Package_Gather = (params?: any) => 
    request({
            url: Api.DownloadExcelTemplateMes_Package_Gather,
            method: 'get',
            data: params,
            responseType: 'blob'
        });


// åˆ†é¡µæŸ¥è¯¢åŒ…数据
export const pageMes_Package_Gather = (params?: any) => 
    request({
            url: Api.PageMes_Package_Gather,
            method: 'post',
            data: params
        });

// ä¸åˆ†é¡µæŸ¥è¯¢åŒ…数据
export const listMes_Package_Gather = (params?: any) => 
    request({
            url: Api.ListMes_Package_Gather,
            method: 'get',
            data: params
        });

// è¯¦æƒ…包数据
export const detailMes_Package_Gather = (id: any) => 
    request({
            url: Api.DetailMes_Package_Gather,
            method: 'get',
            data: { id }
        });


 LA24030_LuLiPackageLine_Web/src/api/main/WmsOrder/mes_Package_LineQueue.ts

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,78 @@
import request from '/@/utils/request';
enum Api {
  AddMes_Package_LineQueue = '/api/mes_Package_LineQueue/add',
  DeleteMes_Package_LineQueue = '/api/mes_Package_LineQueue/delete',
  UpdateMes_Package_LineQueue = '/api/mes_Package_LineQueue/update',
  PageMes_Package_LineQueue = '/api/mes_Package_LineQueue/page',
  ListMes_Package_LineQueue = '/api/mes_Package_LineQueue/list',
  DetailMes_Package_LineQueue = '/api/mes_Package_LineQueue/detail',
  ImportExcelMes_Package_LineQueue = '/api/mes_Package_LineQueue/importExcel',
  DownloadExcelTemplateMes_Package_LineQueue = '/api/mes_Package_LineQueue/downloadExcelTemplate',
}

// å¢žåŠ åŒ…队列数据
export const addMes_Package_LineQueue = (params?: any) =>
    request({
        url: Api.AddMes_Package_LineQueue,
        method: 'post',
        data: params
    });

// åˆ é™¤åŒ…队列数据
export const deleteMes_Package_LineQueue = (params?: any) => 
    request({
            url: Api.DeleteMes_Package_LineQueue,
            method: 'post',
            data: params
        });

// ç¼–辑包队列数据
export const updateMes_Package_LineQueue = (params?: any) => 
    request({
            url: Api.UpdateMes_Package_LineQueue,
            method: 'post',
            data: params
        });

// å¯¼å…¥åŒ…队列数据
export const importExcelMes_Package_LineQueue = (params?: any) =>
    request({
        url: Api.ImportExcelMes_Package_LineQueue,
        method: 'post',
        data: params
    });

// ä¸‹è½½å¯¼å…¥åŒ…队列数据模板
export const downloadExcelTemplateMes_Package_LineQueue = (params?: any) => 
    request({
            url: Api.DownloadExcelTemplateMes_Package_LineQueue,
            method: 'get',
            data: params,
            responseType: 'blob'
        });


// åˆ†é¡µæŸ¥è¯¢åŒ…队列数据
export const pageMes_Package_LineQueue = (params?: any) => 
    request({
            url: Api.PageMes_Package_LineQueue,
            method: 'post',
            data: params
        });

// ä¸åˆ†é¡µæŸ¥è¯¢åŒ…队列数据
export const listMes_Package_LineQueue = (params?: any) => 
    request({
            url: Api.ListMes_Package_LineQueue,
            method: 'get',
            data: params
        });

// è¯¦æƒ…包队列数据
export const detailMes_Package_LineQueue = (id: any) => 
    request({
            url: Api.DetailMes_Package_LineQueue,
            method: 'get',
            data: { id }
        });


 LA24030_LuLiPackageLine_Web/src/api/main/WmsOrder/validateQiTaoOutput.ts

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,78 @@
import request from '/@/utils/request';
enum Api {
  AddValidateQiTaoOutput = '/api/validateQiTaoOutput/add',
  DeleteValidateQiTaoOutput = '/api/validateQiTaoOutput/delete',
  UpdateValidateQiTaoOutput = '/api/validateQiTaoOutput/update',
  PageValidateQiTaoOutput = '/api/validateQiTaoOutput/page',
  ListValidateQiTaoOutput = '/api/validateQiTaoOutput/list',
  DetailValidateQiTaoOutput = '/api/validateQiTaoOutput/detail',
  ImportExcelValidateQiTaoOutput = '/api/validateQiTaoOutput/importExcel',
  DownloadExcelTemplateValidateQiTaoOutput = '/api/validateQiTaoOutput/downloadExcelTemplate',
}

// å¢žåŠ åŒ…数据
export const addValidateQiTaoOutput = (params?: any) =>
    request({
        url: Api.AddValidateQiTaoOutput,
        method: 'post',
        data: params
    });

// åˆ é™¤åŒ…数据
export const deleteValidateQiTaoOutput = (params?: any) => 
    request({
            url: Api.DeleteValidateQiTaoOutput,
            method: 'post',
            data: params
        });

// ç¼–辑包数据
export const updateValidateQiTaoOutput = (params?: any) => 
    request({
            url: Api.UpdateValidateQiTaoOutput,
            method: 'post',
            data: params
        });

// å¯¼å…¥åŒ…数据
export const importExcelValidateQiTaoOutput = (params?: any) =>
    request({
        url: Api.ImportExcelValidateQiTaoOutput,
        method: 'post',
        data: params
    });

// ä¸‹è½½å¯¼å…¥åŒ…数据模板
export const downloadExcelTemplateValidateQiTaoOutput = (params?: any) => 
    request({
            url: Api.DownloadExcelTemplateValidateQiTaoOutput,
            method: 'get',
            data: params,
            responseType: 'blob'
        });


// åˆ†é¡µæŸ¥è¯¢åŒ…数据
export const pageValidateQiTaoOutput = (params?: any) => 
    request({
            url: Api.PageValidateQiTaoOutput,
            method: 'post',
            data: params
        });

// ä¸åˆ†é¡µæŸ¥è¯¢åŒ…数据
export const listValidateQiTaoOutput = (params?: any) => 
    request({
            url: Api.ListValidateQiTaoOutput,
            method: 'get',
            data: params
        });

// è¯¦æƒ…包数据
export const detailValidateQiTaoOutput = (id: any) => 
    request({
            url: Api.DetailValidateQiTaoOutput,
            method: 'get',
            data: { id }
        });


 LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/mes_Package_UnLine_Record/component/editDialog.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,248 @@
<template>
    <div class="mes_Package_UnLine_Record-container">
        <el-dialog v-model="isShowDialog" :width="800" draggable="" :close-on-click-modal="false">
            <template #header>
                <div style="color: #fff">
                    <!--<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>-->
                    <span>{{ props.title }}</span>
                </div>
            </template>
            <el-form :model="ruleForm" ref="ruleFormRef" label-width="auto" :rules="rules" v-loading="loading">
                <el-row :gutter="35">
                    <el-form-item v-show="false">
                        <el-input v-model="ruleForm.id" />
                    </el-form-item>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="包装号" prop="packageCode">
                            <el-input v-model="ruleForm.packageCode" 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="info5">
                            <el-input v-model="ruleForm.info5" placeholder="请输入生产单号" maxlength="60" 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="planNo">
                            <el-input v-model="ruleForm.planNo" 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="orderId">
                            <el-input v-model="ruleForm.orderId" 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="info1">
                            <el-input v-model="ruleForm.info1" placeholder="请输入纸箱长" maxlength="53" 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="info2">
                            <el-input v-model="ruleForm.info2" placeholder="请输入纸箱宽" maxlength="53" 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="info3">
                            <el-input v-model="ruleForm.info3" placeholder="请输入纸箱高" maxlength="53" 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="info4">
                            <el-input v-model="ruleForm.info4" placeholder="请输入销售合同单号" maxlength="60" 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="info6">
                            <el-input v-model="ruleForm.info6" placeholder="请输入第几包" maxlength="60" 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="info7">
                            <el-input v-model="ruleForm.info7" placeholder="请输入经销店名称" maxlength="60" 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="info8">
                            <el-input v-model="ruleForm.info8" placeholder="请输入产品名称" maxlength="60" 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="info10">
                            <el-input v-model="ruleForm.info10" placeholder="请输入客户名称" maxlength="60" 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="自提or发货" prop="info11">
                            <el-input v-model="ruleForm.info11" placeholder="请输入自提or发货" maxlength="60" 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="info12">
                            <el-input v-model="ruleForm.info12" placeholder="请输入包装部件总数量" maxlength="60" 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="info13">
                            <el-input v-model="ruleForm.info13" placeholder="请输入包装面积" maxlength="60" 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="opRemark">
                            <el-input v-model="ruleForm.opRemark" placeholder="请输入备注" maxlength="60" show-word-limit clearable />
							
                        </el-form-item>
						
                    </el-col>
                </el-row>
            </el-form>
            <template #footer>
                <span class="dialog-footer">
                    <el-button @click="cancel">取 æ¶ˆ</el-button>
                    <el-button type="primary" @click="submit" :disabled="disabled_btn">ç¡® å®š</el-button>
                </span>
            </template>
        </el-dialog>
    </div>
</template>
<style scoped>
:deep(.el-select),
:deep(.el-input-number) {
    width: 100%;
}
</style>
<script lang="ts" setup>
    import { ref,onMounted } from "vue";
    import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
    import { ElMessage } from "element-plus";
    import type { FormRules } from "element-plus";
    import { addMes_Package_UnLine_Record, updateMes_Package_UnLine_Record, detailMes_Package_UnLine_Record } from "/@/api/main/ReportCenter/mes_Package_UnLine_Record";

    //父级传递来的参数
    var props = defineProps({
        title: {
        type: String,
        default: "",
    },
    });
    //父级传递来的函数，用于回调
    const emit = defineEmits(["reloadTable"]);
    const ruleFormRef = ref();
    const isShowDialog = ref(false);
    const loading = ref(false);
    const disabled_btn = ref(false);
    const ruleForm = ref<any>({});
    //自行添加其他规则
    const rules = ref<FormRules>({
        packageCode: [{required: true, message: '请输入包装号！', trigger: 'blur',},],
        planNo: [{required: true, message: '请输入批次号！', trigger: 'blur',},],
        orderId: [{required: true, message: '请输入订单号！', trigger: 'blur',},],
        isDelete: [{required: true, message: '请选择软删除！', trigger: 'change',},],
    });

    /*
     * æ‰“开弹窗
     * @param flag æ ‡è®°ï¼ˆ1新增 2编辑 3查看）
     * @param row  è¡Œæ•°æ®
     */
    const openDialog = async (flag: number,row: any) => {
        // ruleForm.value = JSON.parse(JSON.stringify(row));
        // æ”¹ç”¨detail获取最新数据来编辑
        let rowData = JSON.parse(JSON.stringify(row));
        if (rowData.id)
            ruleForm.value = (await detailMes_Package_UnLine_Record(rowData.id)).data.result;
        else {
            ruleForm.value = rowData;
        }
        isShowDialog.value = true;
    };

    // å…³é—­å¼¹çª—
    const closeDialog = () => {
        emit("reloadTable");
        isShowDialog.value = false;
    };

    // å–消
    const cancel = () => {
        isShowDialog.value = false;
    };

    // æäº¤
    const submit = async () => {
        disabled_btn.value = true;
        ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
            if (isValid) {
                loading.value = true;
                let values = ruleForm.value;
                let ret={};
                let title='新增';
                if (ruleForm.value.id == undefined || ruleForm.value.id == null || ruleForm.value.id == "" || ruleForm.value.id == 0) {
                    ret = await addMes_Package_UnLine_Record(values);
                } else {
                    title='编辑';
                    ret = await updateMes_Package_UnLine_Record(values);
                }
                loading.value = false;
                disabled_btn.value = false;
                if(ret.data.type=="success"){
                    ElMessage.success(title+'成功');
                    closeDialog();
                }
            } else {
                disabled_btn.value = false;
                ElMessage({
                    message: `表单有${Object.keys(fields).length}处验证失败，请修改后再提交`,
                    type: "error",
                });
            }
        });
    };

	





    // é¡µé¢åŠ è½½æ—¶
    onMounted(async () => {
    });

    //将属性或者函数暴露给父组件
    defineExpose({ openDialog });
</script>





 LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/mes_Package_UnLine_Record/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,335 @@
<template>
  <div class="mes_Package_UnLine_Record-container">
    <el-card shadow="hover" :body-style="{ paddingBottom: '0' }"> 
      <el-form :model="queryParamsMes_Package_UnLine_Record" ref="queryForm" labelWidth="90">
        <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_Package_UnLine_Record.searchKey" clearable="" placeholder="包装号,生产单号,批次号,订单号,销售合同单号,第几包,经销店名称,产品名称,客户名称,自提or发货,包装部件总数量,包装面积,备注,创建人,修改人"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_UnLine_Record">
            <el-form-item label="包装号">
              <el-input v-model="queryParamsMes_Package_UnLine_Record.packageCode" clearable="" placeholder="请输入包装号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_UnLine_Record">
            <el-form-item label="生产单号">
              <el-input v-model="queryParamsMes_Package_UnLine_Record.info5" clearable="" placeholder="请输入生产单号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_UnLine_Record">
            <el-form-item label="批次号">
              <el-input v-model="queryParamsMes_Package_UnLine_Record.planNo" clearable="" placeholder="请输入批次号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_UnLine_Record">
            <el-form-item label="订单号">
              <el-input v-model="queryParamsMes_Package_UnLine_Record.orderId" clearable="" placeholder="请输入订单号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_UnLine_Record">
            <el-form-item label="纸箱长">
              <el-input v-model="queryParamsMes_Package_UnLine_Record.info1" clearable="" placeholder="请输入纸箱长"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_UnLine_Record">
            <el-form-item label="纸箱宽">
              <el-input v-model="queryParamsMes_Package_UnLine_Record.info2" clearable="" placeholder="请输入纸箱宽"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_UnLine_Record">
            <el-form-item label="纸箱高">
              <el-input v-model="queryParamsMes_Package_UnLine_Record.info3" clearable="" placeholder="请输入纸箱高"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_UnLine_Record">
            <el-form-item label="销售合同单号">
              <el-input v-model="queryParamsMes_Package_UnLine_Record.info4" clearable="" placeholder="请输入销售合同单号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_UnLine_Record">
            <el-form-item label="第几包">
              <el-input v-model="queryParamsMes_Package_UnLine_Record.info6" clearable="" placeholder="请输入第几包"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_UnLine_Record">
            <el-form-item label="经销店名称">
              <el-input v-model="queryParamsMes_Package_UnLine_Record.info7" clearable="" placeholder="请输入经销店名称"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_UnLine_Record">
            <el-form-item label="产品名称">
              <el-input v-model="queryParamsMes_Package_UnLine_Record.info8" clearable="" placeholder="请输入产品名称"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_UnLine_Record">
            <el-form-item label="客户名称">
              <el-input v-model="queryParamsMes_Package_UnLine_Record.info10" clearable="" placeholder="请输入客户名称"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_UnLine_Record">
            <el-form-item label="自提or发货">
              <el-input v-model="queryParamsMes_Package_UnLine_Record.info11" clearable="" placeholder="请输入自提or发货"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_UnLine_Record">
            <el-form-item label="包装部件总数量">
              <el-input v-model="queryParamsMes_Package_UnLine_Record.info12" clearable="" placeholder="请输入包装部件总数量"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_UnLine_Record">
            <el-form-item label="包装面积">
              <el-input v-model="queryParamsMes_Package_UnLine_Record.info13" clearable="" placeholder="请输入包装面积"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_UnLine_Record">
            <el-form-item label="备注">
              <el-input v-model="queryParamsMes_Package_UnLine_Record.opRemark" 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;">
                <el-button type="primary"  icon="ele-Search" @click="handleQueryMes_Package_UnLine_Record" v-auth="'mes_Package_UnLine_Record:page'" :disabled="disabled_btnMes_Package_UnLine_Record"> æŸ¥è¯¢ </el-button>
                      <el-button icon="ele-Refresh" @click="resetMes_Package_UnLine_Record"> é‡ç½® </el-button>
                        <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUIMes_Package_UnLine_Record" v-if="!showAdvanceQueryUIMes_Package_UnLine_Record" style="margin-left:5px;"> é«˜çº§æŸ¥è¯¢ </el-button>
                        <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUIMes_Package_UnLine_Record" v-if="showAdvanceQueryUIMes_Package_UnLine_Record" style="margin-left:5px;"> éšè— </el-button>
                <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddMes_Package_UnLine_Record" v-auth="'mes_Package_UnLine_Record:add'"> æ–°å¢ž </el-button>
                <el-button type="primary" style="margin-left:5px;" icon="ele-Download" @click="handleExportExcelMes_Package_UnLine_Record"  v-auth="'mes_Package_UnLine_Record:exportExcel'" > å¯¼å‡º </el-button>
              </el-button-group>
            </el-form-item>
            
          </el-col>
        </el-row>
      </el-form>
    </el-card>
    <el-card class="full-table" shadow="hover" style="margin-top: 5px">
      <el-table
                ref="tableRefMes_Package_UnLine_Record"
                :data="tableDataMes_Package_UnLine_Record"
                style="width: 100%"
                v-loading="loadingMes_Package_UnLine_Record"
                tooltip-effect="light"
                                row-key="id"
                @sort-change="sortChangeMes_Package_UnLine_Record"
                border="">
        <el-table-column type="index" label="序号" width="55" align="center"/>
        <el-table-column prop="packageCode" label="包装号"  show-overflow-tooltip="" />
        <el-table-column prop="info5" label="生产单号"  show-overflow-tooltip="" />
        <el-table-column prop="planNo" label="批次号"  show-overflow-tooltip="" />
        <el-table-column prop="orderId" label="订单号"  show-overflow-tooltip="" />
        <el-table-column prop="info1" label="纸箱长"  show-overflow-tooltip="" />
        <el-table-column prop="info2" label="纸箱宽"  show-overflow-tooltip="" />
        <el-table-column prop="info3" label="纸箱高"  show-overflow-tooltip="" />
        <el-table-column prop="info4" label="销售合同单号"  show-overflow-tooltip="" />
        <el-table-column prop="info6" label="第几包"  show-overflow-tooltip="" />
        <el-table-column prop="info7" label="经销店名称"  show-overflow-tooltip="" />
        <el-table-column prop="info8" label="产品名称"  show-overflow-tooltip="" />
        <el-table-column prop="info10" label="客户名称"  show-overflow-tooltip="" />
        <el-table-column prop="info11" label="自提or发货"  show-overflow-tooltip="" />
        <el-table-column prop="info12" label="包装部件总数量"  show-overflow-tooltip="" />
        <el-table-column prop="info13" label="包装面积"  show-overflow-tooltip="" />
        <el-table-column prop="opRemark" 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 label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('mes_Package_UnLine_Record:update') || auth('mes_Package_UnLine_Record:delete')">
          <template #default="scope">
            <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMes_Package_UnLine_Record(scope.row)" v-auth="'mes_Package_UnLine_Record:update'"> ç¼–辑 </el-button>
            <el-button icon="ele-Delete" size="small" text="" type="primary" @click="delMes_Package_UnLine_Record(scope.row)" v-auth="'mes_Package_UnLine_Record:delete'"> åˆ é™¤ </el-button>
          </template>
        </el-table-column>
      </el-table>
      <el-pagination
                v-model:currentPage="tableParamsMes_Package_UnLine_Record.page"
                v-model:page-size="tableParamsMes_Package_UnLine_Record.pageSize"
                :total="tableParamsMes_Package_UnLine_Record.total"
                :page-sizes="[10, 20, 50, 100, 200, 500]"
                small=""
                background=""
                @size-change="handleSizeChangeMes_Package_UnLine_Record"
                @current-change="handleCurrentChangeMes_Package_UnLine_Record"
                layout="total, sizes, prev, pager, next, jumper"
    />
      <printDialogMes_Package_UnLine_Record
        ref="printDialogRefMes_Package_UnLine_Record"
        :title="printMes_Package_UnLine_RecordTitle"
        @reloadTable="handleQueryMes_Package_UnLine_Record" />
      <editDialogMes_Package_UnLine_Record
        ref="editDialogRefMes_Package_UnLine_Record"
        :title="editMes_Package_UnLine_RecordTitle"
        @reloadTable="handleQueryMes_Package_UnLine_Record"
      />
    </el-card>
  </div>
</template>

<script lang="ts" setup="" name="mes_Package_UnLine_Record">
  import { ref,onMounted } from "vue";
  import { ElMessageBox, ElMessage } from "element-plus";
  import { auth } from '/@/utils/authFunction';
  import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
  import { formatDate,formatDate_T_Date,formatDate_T_Time,defaultTimeRange } from '/@/utils/formatTime';
  import { exportPageExcel } from '/@/utils/exportPageExcel' //引入导出方法


  import printDialogMes_Package_UnLine_Record from '/@/views/system/print/component/hiprint/preview.vue'
  import { pageMes_Package_UnLine_Record, deleteMes_Package_UnLine_Record,importExcelMes_Package_UnLine_Record,downloadExcelTemplateMes_Package_UnLine_Record } from '/@/api/main/ReportCenter/mes_Package_UnLine_Record';


  
  /***************************************************[包下线记录操作]开始***************************************************/
  const showAdvanceQueryUIMes_Package_UnLine_Record = ref(false);
  const tableRefMes_Package_UnLine_Record = ref(null);
  const printDialogRefMes_Package_UnLine_Record = ref();
  const editDialogRefMes_Package_UnLine_Record = ref();
  const loadingMes_Package_UnLine_Record = ref(false);
  const disabled_btnMes_Package_UnLine_Record = ref(false);
  const tableDataMes_Package_UnLine_Record = ref<any>([]);
  const queryParamsMes_Package_UnLine_Record = ref<any>({});
  const tableParamsMes_Package_UnLine_Record = ref({
    page: 1,
    pageSize: 10,
    total: 0,
  });

  const printMes_Package_UnLine_RecordTitle = ref("");
  const editMes_Package_UnLine_RecordTitle = ref("");

  // æ”¹å˜é«˜çº§æŸ¥è¯¢çš„控件显示状态
  const changeAdvanceQueryUIMes_Package_UnLine_Record = () => {
    showAdvanceQueryUIMes_Package_UnLine_Record.value = !showAdvanceQueryUIMes_Package_UnLine_Record.value;
  }

  // æŸ¥è¯¢åŒ…下线记录
  const handleQueryMes_Package_UnLine_Record = async () => {
    loadingMes_Package_UnLine_Record.value = true;
    disabled_btnMes_Package_UnLine_Record.value = true;
    var res = await pageMes_Package_UnLine_Record(Object.assign(queryParamsMes_Package_UnLine_Record.value, tableParamsMes_Package_UnLine_Record.value));
    if(res.data.type=="success"){
      tableDataMes_Package_UnLine_Record.value = res.data.result?.items ?? [];
      tableParamsMes_Package_UnLine_Record.value.total = res.data.result?.total;
    }
    loadingMes_Package_UnLine_Record.value = false;
    disabled_btnMes_Package_UnLine_Record.value = false;
  };

  // é‡ç½®åŒ…下线记录查询
  const resetMes_Package_UnLine_Record = async () => {
    queryParamsMes_Package_UnLine_Record.value = {}
  };

  // åŒ…下线记录列排序
  const sortChangeMes_Package_UnLine_Record = async (column: any) => {
    queryParamsMes_Package_UnLine_Record.value.field = column.prop;
    queryParamsMes_Package_UnLine_Record.value.order = column.order;
    await handleQueryMes_Package_UnLine_Record();
  };

  // æ‰“开新增包下线记录页面
  const openAddMes_Package_UnLine_Record = () => {
    editMes_Package_UnLine_RecordTitle.value = '添加包下线记录';
    editDialogRefMes_Package_UnLine_Record.value.openDialog(1,{});
  };

  // æ‰“开打印包下线记录页面
  const openPrintMes_Package_UnLine_Record = async (row: any) => {
    printMes_Package_UnLine_RecordTitle.value = '打印包下线记录';
  }
  
  // æ‰“开编辑包下线记录页面
  const openEditMes_Package_UnLine_Record = (row: any) => {
    editMes_Package_UnLine_RecordTitle.value = '编辑包下线记录';
    editDialogRefMes_Package_UnLine_Record.value.openDialog(2,row);
  };

  // åˆ é™¤åŒ…下线记录
  const delMes_Package_UnLine_Record = (row: any) => {
    ElMessageBox.confirm(`确定要删除吗?`, "提示", {
    confirmButtonText: "确定",
    cancelButtonText: "取消",
    type: "warning",
  })
  .then(async () => {
    loadingMes_Package_UnLine_Record.value = true;
    var ret = await deleteMes_Package_UnLine_Record(row);
    if(ret.data.type=="success"){
        ElMessage.success("删除成功");
    }
    loadingMes_Package_UnLine_Record.value = false;
    handleQueryMes_Package_UnLine_Record();
  })
  .catch(() => {});
  };

  // æ”¹å˜åŒ…下线记录页面容量
  const handleSizeChangeMes_Package_UnLine_Record = (val: number) => {
    tableParamsMes_Package_UnLine_Record.value.pageSize = val;
    handleQueryMes_Package_UnLine_Record();
  };

  // æ”¹å˜åŒ…下线记录页码序号
  const handleCurrentChangeMes_Package_UnLine_Record = (val: number) => {
    tableParamsMes_Package_UnLine_Record.value.page = val;
    handleQueryMes_Package_UnLine_Record();
  };

/***************************************************[包下线记录操作]结束***************************************************/
/***************************************************[包下线记录导出]开始***************************************************/
//定义当前页面的方法组
const functionMapMes_Package_UnLine_Record = {
      formatDate_T_Date,
      formatDate_T_Time
};
//点击导出按钮
const handleExportExcelMes_Package_UnLine_Record = async (formData:Blob) => {
    loadingMes_Package_UnLine_Record.value = true;
    disabled_btnMes_Package_UnLine_Record.value = true;
    var new_tableParamsMes_Package_UnLine_Record=JSON.parse(JSON.stringify(tableParamsMes_Package_UnLine_Record.value));
    new_tableParamsMes_Package_UnLine_Record.page = 1;
    new_tableParamsMes_Package_UnLine_Record.pageSize = 100000;
    var res = await pageMes_Package_UnLine_Record(Object.assign(queryParamsMes_Package_UnLine_Record.value, new_tableParamsMes_Package_UnLine_Record));
    if(res.data.type=="success"){
      exportExcelMes_Package_UnLine_Record(res.data.result?.items ?? []);
    }
    loadingMes_Package_UnLine_Record.value = false;
    disabled_btnMes_Package_UnLine_Record.value = false;
};
//导出
const exportExcelMes_Package_UnLine_Record  = async (exportDataList:Array) => {
  exportPageExcel(exportDataList, tableRefMes_Package_UnLine_Record,"包下线记录",functionMapMes_Package_UnLine_Record);
};
/***************************************************[包下线记录导出]结束***************************************************/
  // åŒ…下线记录页面加载时
  onMounted(async () => {
  });

  handleQueryMes_Package_UnLine_Record();
</script>
<style scoped>
:deep(.el-input),
:deep(.el-select),
:deep(.el-input-number) {
    width: 100%;
}
</style>


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,179 @@
<template>
    <div class="mesPushPaperCut-container">
        <el-dialog v-model="isShowDialog" :width="800" draggable="" :close-on-click-modal="false">
            <template #header>
                <div style="color: #fff">
                    <!--<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>-->
                    <span>{{ props.title }}</span>
                </div>
            </template>
            <el-form :model="ruleForm" ref="ruleFormRef" label-width="auto" :rules="rules" v-loading="loading">
                <el-row :gutter="35">
                    <el-form-item v-show="false">
                        <el-input v-model="ruleForm.id" />
                    </el-form-item>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="包装号" prop="packageCode">
                            <el-input v-model="ruleForm.packageCode" 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="pushStatus">
                            <el-select clearable v-model="ruleForm.pushStatus" placeholder="请选择推送状态">
                                <el-option v-for="(item,index) in  getEnumPushStatusData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
								
                            </el-select>
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="推送时间" prop="pushTime">
                            <el-date-picker v-model="ruleForm.pushTime" 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="pushNum">
                            <el-input-number v-model="ruleForm.pushNum" placeholder="请输入推送次数" 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="apiMessage">
                            <el-input v-model="ruleForm.apiMessage" placeholder="请输入接口返回参数" maxlength="50" show-word-limit clearable />
							
                        </el-form-item>
						
                    </el-col>
                </el-row>
            </el-form>
            <template #footer>
                <span class="dialog-footer">
                    <el-button @click="cancel">取 æ¶ˆ</el-button>
                    <el-button type="primary" @click="submit" :disabled="disabled_btn">ç¡® å®š</el-button>
                </span>
            </template>
        </el-dialog>
    </div>
</template>
<style scoped>
:deep(.el-select),
:deep(.el-input-number) {
    width: 100%;
}
</style>
<script lang="ts" setup>
    import { ref,onMounted } from "vue";
    import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
    import { ElMessage } from "element-plus";
    import type { FormRules } from "element-plus";
    import { addMesPushPaperCut, updateMesPushPaperCut, detailMesPushPaperCut } from "/@/api/main/ThirdInterFace/mesPushPaperCut";
    import { getAPI } from '/@/utils/axios-utils';
    import { SysEnumApi } from '/@/api-services/api';

    const getEnumPushStatusData = ref<any>([]);
    //父级传递来的参数
    var props = defineProps({
        title: {
        type: String,
        default: "",
    },
    });
    //父级传递来的函数，用于回调
    const emit = defineEmits(["reloadTable"]);
    const ruleFormRef = ref();
    const isShowDialog = ref(false);
    const loading = ref(false);
    const disabled_btn = ref(false);
    const ruleForm = ref<any>({});
    //自行添加其他规则
    const rules = ref<FormRules>({
        packageCode: [{required: true, message: '请输入包装号！', trigger: 'blur',},],
        pushStatus: [{required: true, message: '请选择推送状态！', trigger: 'change',},],
        pushNum: [{required: true, message: '请输入推送次数！', trigger: 'blur',},],
        apiMessage: [{required: true, message: '请输入接口返回参数！', trigger: 'blur',},],
        isDelete: [{required: true, message: '请选择软删除！', trigger: 'change',},],
    });

    /*
     * æ‰“开弹窗
     * @param flag æ ‡è®°ï¼ˆ1新增 2编辑 3查看）
     * @param row  è¡Œæ•°æ®
     */
    const openDialog = async (flag: number,row: any) => {
        // ruleForm.value = JSON.parse(JSON.stringify(row));
        // æ”¹ç”¨detail获取最新数据来编辑
        let rowData = JSON.parse(JSON.stringify(row));
        if (rowData.id)
            ruleForm.value = (await detailMesPushPaperCut(rowData.id)).data.result;
        else {
            ruleForm.value = rowData;
        }
        isShowDialog.value = true;
    };

    // å…³é—­å¼¹çª—
    const closeDialog = () => {
        emit("reloadTable");
        isShowDialog.value = false;
    };

    // å–消
    const cancel = () => {
        isShowDialog.value = false;
    };

    // æäº¤
    const submit = async () => {
        disabled_btn.value = true;
        ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
            if (isValid) {
                loading.value = true;
                let values = ruleForm.value;
                let ret={};
                let title='新增';
                if (ruleForm.value.id == undefined || ruleForm.value.id == null || ruleForm.value.id == "" || ruleForm.value.id == 0) {
                    ret = await addMesPushPaperCut(values);
                } else {
                    title='编辑';
                    ret = await updateMesPushPaperCut(values);
                }
                loading.value = false;
                disabled_btn.value = false;
                if(ret.data.type=="success"){
                    ElMessage.success(title+'成功');
                    closeDialog();
                }
            } else {
                disabled_btn.value = false;
                ElMessage({
                    message: `表单有${Object.keys(fields).length}处验证失败，请修改后再提交`,
                    type: "error",
                });
            }
        });
    };

	





    // é¡µé¢åŠ è½½æ—¶
    onMounted(async () => {
            getEnumPushStatusData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('PushStatusEnum')).data.result ?? [];
    });

    //将属性或者函数暴露给父组件
    defineExpose({ openDialog });
</script>





 LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,272 @@
<template>
  <div class="mesPushPaperCut-container">
    <el-card shadow="hover" :body-style="{ paddingBottom: '0' }"> 
      <el-form :model="queryParamsMesPushPaperCut" ref="queryForm" labelWidth="90">
        <el-row>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
            <el-form-item label="关键字">
              <el-input v-model="queryParamsMesPushPaperCut.searchKey" clearable="" placeholder="包装号,接口返回参数,创建人,修改人"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPaperCut">
            <el-form-item label="包装号">
              <el-input v-model="queryParamsMesPushPaperCut.packageCode" clearable="" placeholder="请输入包装号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPaperCut">
            <el-form-item label="推送状态">
              <el-select clearable="" v-model="queryParamsMesPushPaperCut.pushStatus" placeholder="请选择推送状态">
                <el-option v-for="(item,index) in getEnumPushStatusData_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="showAdvanceQueryUIMesPushPaperCut">
            <el-form-item label="推送时间">
              <el-date-picker placeholder="请选择推送时间" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsMesPushPaperCut.pushTimeRange" />
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPaperCut">
            <el-form-item label="推送次数">
              <el-input-number v-model="queryParamsMesPushPaperCut.pushNum"  clearable="" placeholder="请输入推送次数"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPaperCut">
            <el-form-item label="接口返回参数">
              <el-input v-model="queryParamsMesPushPaperCut.apiMessage" 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;">
                <el-button type="primary"  icon="ele-Search" @click="handleQueryMesPushPaperCut" v-auth="'mesPushPaperCut:page'" :disabled="disabled_btnMesPushPaperCut"> æŸ¥è¯¢ </el-button>
                      <el-button icon="ele-Refresh" @click="resetMesPushPaperCut"> é‡ç½® </el-button>
                        <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUIMesPushPaperCut" v-if="!showAdvanceQueryUIMesPushPaperCut" style="margin-left:5px;"> é«˜çº§æŸ¥è¯¢ </el-button>
                        <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUIMesPushPaperCut" v-if="showAdvanceQueryUIMesPushPaperCut" style="margin-left:5px;"> éšè— </el-button>
                <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddMesPushPaperCut" v-auth="'mesPushPaperCut:add'"> æ–°å¢ž </el-button>
                <el-button type="primary" style="margin-left:5px;" icon="ele-Download" @click="handleExportExcelMesPushPaperCut"  v-auth="'mesPushPaperCut:exportExcel'" > å¯¼å‡º </el-button>
              </el-button-group>
            </el-form-item>
            
          </el-col>
        </el-row>
      </el-form>
    </el-card>
    <el-card class="full-table" shadow="hover" style="margin-top: 5px">
      <el-table
                ref="tableRefMesPushPaperCut"
                :data="tableDataMesPushPaperCut"
                style="width: 100%"
                v-loading="loadingMesPushPaperCut"
                tooltip-effect="light"
                                row-key="id"
                @sort-change="sortChangeMesPushPaperCut"
                border="">
        <el-table-column type="index" label="序号" width="55" align="center"/>
        <el-table-column prop="packageCode" label="包装号"  show-overflow-tooltip="" />
          <el-table-column prop="pushStatus" label="推送状态"  show-overflow-tooltip="" >
            <template #default="scope">
              <el-tag>{{ getEnumDesc(scope.row.pushStatus, getEnumPushStatusData_Index)}}</el-tag>
            </template>
          </el-table-column>
         <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="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 label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('mesPushPaperCut:update') || auth('mesPushPaperCut:delete')">
          <template #default="scope">
            <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMesPushPaperCut(scope.row)" v-auth="'mesPushPaperCut:update'"> ç¼–辑 </el-button>
            <el-button icon="ele-Delete" size="small" text="" type="primary" @click="delMesPushPaperCut(scope.row)" v-auth="'mesPushPaperCut:delete'"> åˆ é™¤ </el-button>
          </template>
        </el-table-column>
      </el-table>
      <el-pagination
                v-model:currentPage="tableParamsMesPushPaperCut.page"
                v-model:page-size="tableParamsMesPushPaperCut.pageSize"
                :total="tableParamsMesPushPaperCut.total"
                :page-sizes="[10, 20, 50, 100, 200, 500]"
                small=""
                background=""
                @size-change="handleSizeChangeMesPushPaperCut"
                @current-change="handleCurrentChangeMesPushPaperCut"
                layout="total, sizes, prev, pager, next, jumper"
    />
      <printDialogMesPushPaperCut
        ref="printDialogRefMesPushPaperCut"
        :title="printMesPushPaperCutTitle"
        @reloadTable="handleQueryMesPushPaperCut" />
      <editDialogMesPushPaperCut
        ref="editDialogRefMesPushPaperCut"
        :title="editMesPushPaperCutTitle"
        @reloadTable="handleQueryMesPushPaperCut"
      />
    </el-card>
  </div>
</template>

<script lang="ts" setup="" name="mesPushPaperCut">
  import { ref,onMounted } from "vue";
  import { ElMessageBox, ElMessage } from "element-plus";
  import { auth } from '/@/utils/authFunction';
  import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
  import { formatDate,formatDate_T_Date,formatDate_T_Time,defaultTimeRange } from '/@/utils/formatTime';
  import { exportPageExcel } from '/@/utils/exportPageExcel' //引入导出方法


  import printDialogMesPushPaperCut from '/@/views/system/print/component/hiprint/preview.vue'
  import { pageMesPushPaperCut, deleteMesPushPaperCut,importExcelMesPushPaperCut,downloadExcelTemplateMesPushPaperCut } from '/@/api/main/ThirdInterFace/mesPushPaperCut';
    import { getAPI } from '/@/utils/axios-utils';
    import { SysEnumApi } from '/@/api-services/api';
  import commonFunction from '/@/utils/commonFunction';

  const getEnumPushStatusData_Index = ref<any>([]);

    const { getEnumDesc } = commonFunction();
  
  /***************************************************[纸箱机对接操作]开始***************************************************/
  const showAdvanceQueryUIMesPushPaperCut = ref(false);
  const tableRefMesPushPaperCut = ref(null);
  const printDialogRefMesPushPaperCut = ref();
  const editDialogRefMesPushPaperCut = ref();
  const loadingMesPushPaperCut = ref(false);
  const disabled_btnMesPushPaperCut = ref(false);
  const tableDataMesPushPaperCut = ref<any>([]);
  const queryParamsMesPushPaperCut = ref<any>({});
  const tableParamsMesPushPaperCut = ref({
    page: 1,
    pageSize: 10,
    total: 0,
  });

  const printMesPushPaperCutTitle = ref("");
  const editMesPushPaperCutTitle = ref("");

  // æ”¹å˜é«˜çº§æŸ¥è¯¢çš„控件显示状态
  const changeAdvanceQueryUIMesPushPaperCut = () => {
    showAdvanceQueryUIMesPushPaperCut.value = !showAdvanceQueryUIMesPushPaperCut.value;
  }

  // æŸ¥è¯¢çº¸ç®±æœºå¯¹æŽ¥
  const handleQueryMesPushPaperCut = async () => {
    loadingMesPushPaperCut.value = true;
    disabled_btnMesPushPaperCut.value = true;
    var res = await pageMesPushPaperCut(Object.assign(queryParamsMesPushPaperCut.value, tableParamsMesPushPaperCut.value));
    if(res.data.type=="success"){
      tableDataMesPushPaperCut.value = res.data.result?.items ?? [];
      tableParamsMesPushPaperCut.value.total = res.data.result?.total;
    }
    loadingMesPushPaperCut.value = false;
    disabled_btnMesPushPaperCut.value = false;
  };

  // é‡ç½®çº¸ç®±æœºå¯¹æŽ¥æŸ¥è¯¢
  const resetMesPushPaperCut = async () => {
    queryParamsMesPushPaperCut.value = {}
  };

  // çº¸ç®±æœºå¯¹æŽ¥åˆ—排序
  const sortChangeMesPushPaperCut = async (column: any) => {
    queryParamsMesPushPaperCut.value.field = column.prop;
    queryParamsMesPushPaperCut.value.order = column.order;
    await handleQueryMesPushPaperCut();
  };

  // æ‰“开新增纸箱机对接页面
  const openAddMesPushPaperCut = () => {
    editMesPushPaperCutTitle.value = '添加纸箱机对接';
    editDialogRefMesPushPaperCut.value.openDialog(1,{});
  };

  // æ‰“开打印纸箱机对接页面
  const openPrintMesPushPaperCut = async (row: any) => {
    printMesPushPaperCutTitle.value = '打印纸箱机对接';
  }
  
  // æ‰“开编辑纸箱机对接页面
  const openEditMesPushPaperCut = (row: any) => {
    editMesPushPaperCutTitle.value = '编辑纸箱机对接';
    editDialogRefMesPushPaperCut.value.openDialog(2,row);
  };

  // åˆ é™¤çº¸ç®±æœºå¯¹æŽ¥
  const delMesPushPaperCut = (row: any) => {
    ElMessageBox.confirm(`确定要删除吗?`, "提示", {
    confirmButtonText: "确定",
    cancelButtonText: "取消",
    type: "warning",
  })
  .then(async () => {
    loadingMesPushPaperCut.value = true;
    var ret = await deleteMesPushPaperCut(row);
    if(ret.data.type=="success"){
        ElMessage.success("删除成功");
    }
    loadingMesPushPaperCut.value = false;
    handleQueryMesPushPaperCut();
  })
  .catch(() => {});
  };

  // æ”¹å˜çº¸ç®±æœºå¯¹æŽ¥é¡µé¢å®¹é‡
  const handleSizeChangeMesPushPaperCut = (val: number) => {
    tableParamsMesPushPaperCut.value.pageSize = val;
    handleQueryMesPushPaperCut();
  };

  // æ”¹å˜çº¸ç®±æœºå¯¹æŽ¥é¡µç åºå·
  const handleCurrentChangeMesPushPaperCut = (val: number) => {
    tableParamsMesPushPaperCut.value.page = val;
    handleQueryMesPushPaperCut();
  };

/***************************************************[纸箱机对接操作]结束***************************************************/
/***************************************************[纸箱机对接导出]开始***************************************************/
//定义当前页面的方法组
const functionMapMesPushPaperCut = {
      getEnumPushStatusData_Index,
      formatDate_T_Date,
      formatDate_T_Time
};
//点击导出按钮
const handleExportExcelMesPushPaperCut = async (formData:Blob) => {
    loadingMesPushPaperCut.value = true;
    disabled_btnMesPushPaperCut.value = true;
    var new_tableParamsMesPushPaperCut=JSON.parse(JSON.stringify(tableParamsMesPushPaperCut.value));
    new_tableParamsMesPushPaperCut.page = 1;
    new_tableParamsMesPushPaperCut.pageSize = 100000;
    var res = await pageMesPushPaperCut(Object.assign(queryParamsMesPushPaperCut.value, new_tableParamsMesPushPaperCut));
    if(res.data.type=="success"){
      exportExcelMesPushPaperCut(res.data.result?.items ?? []);
    }
    loadingMesPushPaperCut.value = false;
    disabled_btnMesPushPaperCut.value = false;
};
//导出
const exportExcelMesPushPaperCut  = async (exportDataList:Array) => {
  exportPageExcel(exportDataList, tableRefMesPushPaperCut,"纸箱机对接",functionMapMesPushPaperCut);
};
/***************************************************[纸箱机对接导出]结束***************************************************/
  // çº¸ç®±æœºå¯¹æŽ¥é¡µé¢åŠ è½½æ—¶
  onMounted(async () => {
    getEnumPushStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('PushStatusEnum')).data.result ?? [];
  });

  handleQueryMesPushPaperCut();
</script>
<style scoped>
:deep(.el-input),
:deep(.el-select),
:deep(.el-input-number) {
    width: 100%;
}
</style>


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,268 @@
<template>
    <div class="mes_Package_Gather-container">
        <el-dialog v-model="isShowDialog" :width="800" draggable="" :close-on-click-modal="false">
            <template #header>
                <div style="color: #fff">
                    <!--<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>-->
                    <span>{{ props.title }}</span>
                </div>
            </template>
            <el-form :model="ruleForm" ref="ruleFormRef" label-width="auto" :rules="rules" v-loading="loading">
                <el-row :gutter="35">
                    <el-form-item v-show="false">
                        <el-input v-model="ruleForm.id" />
                    </el-form-item>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="包装号" prop="packageCode">
                            <el-input v-model="ruleForm.packageCode" 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="info5">
                            <el-input v-model="ruleForm.info5" placeholder="请输入生产单号" maxlength="60" 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="planNo">
                            <el-input v-model="ruleForm.planNo" 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="orderId">
                            <el-input v-model="ruleForm.orderId" 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="areaCode">
                            <el-select clearable v-model="ruleForm.areaCode" placeholder="请选择所在区域">
                                <el-option v-for="(item,index) in  getEnumAreaCodeData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
								
                            </el-select>
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="板料状态" prop="upiStatus">
                            <el-select clearable v-model="ruleForm.upiStatus" placeholder="请选择板料状态">
                                <el-option v-for="(item,index) in  getEnumUpiStatusData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
								
                            </el-select>
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="纸箱长" prop="info1">
                            <el-input v-model="ruleForm.info1" placeholder="请输入纸箱长" maxlength="53" 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="info2">
                            <el-input v-model="ruleForm.info2" placeholder="请输入纸箱宽" maxlength="53" 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="info3">
                            <el-input v-model="ruleForm.info3" placeholder="请输入纸箱高" maxlength="53" 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="info4">
                            <el-input v-model="ruleForm.info4" placeholder="请输入销售合同单号" maxlength="60" 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="info6">
                            <el-input v-model="ruleForm.info6" placeholder="请输入第几包" maxlength="60" 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="info7">
                            <el-input v-model="ruleForm.info7" placeholder="请输入经销店名称" maxlength="60" 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="info8">
                            <el-input v-model="ruleForm.info8" placeholder="请输入产品名称" maxlength="60" 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="info10">
                            <el-input v-model="ruleForm.info10" placeholder="请输入客户名称" maxlength="60" 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="自提or发货" prop="info11">
                            <el-input v-model="ruleForm.info11" placeholder="请输入自提or发货" maxlength="60" 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="info12">
                            <el-input v-model="ruleForm.info12" placeholder="请输入包装部件总数量" maxlength="60" 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="info13">
                            <el-input v-model="ruleForm.info13" placeholder="请输入包装面积" maxlength="60" show-word-limit clearable />
							
                        </el-form-item>
						
                    </el-col>
                </el-row>
            </el-form>
            <template #footer>
                <span class="dialog-footer">
                    <el-button @click="cancel">取 æ¶ˆ</el-button>
                    <el-button type="primary" @click="submit" :disabled="disabled_btn">ç¡® å®š</el-button>
                </span>
            </template>
        </el-dialog>
    </div>
</template>
<style scoped>
:deep(.el-select),
:deep(.el-input-number) {
    width: 100%;
}
</style>
<script lang="ts" setup>
    import { ref,onMounted } from "vue";
    import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
    import { ElMessage } from "element-plus";
    import type { FormRules } from "element-plus";
    import { addMes_Package_Gather, updateMes_Package_Gather, detailMes_Package_Gather } from "/@/api/main/WmsOrder/mes_Package_Gather";
    import { getAPI } from '/@/utils/axios-utils';
    import { SysEnumApi } from '/@/api-services/api';

    const getEnumAreaCodeData = ref<any>([]);
    const getEnumUpiStatusData = ref<any>([]);
    //父级传递来的参数
    var props = defineProps({
        title: {
        type: String,
        default: "",
    },
    });
    //父级传递来的函数，用于回调
    const emit = defineEmits(["reloadTable"]);
    const ruleFormRef = ref();
    const isShowDialog = ref(false);
    const loading = ref(false);
    const disabled_btn = ref(false);
    const ruleForm = ref<any>({});
    //自行添加其他规则
    const rules = ref<FormRules>({
        packageCode: [{required: true, message: '请输入包装号！', trigger: 'blur',},],
        planNo: [{required: true, message: '请输入批次号！', trigger: 'blur',},],
        orderId: [{required: true, message: '请输入订单号！', trigger: 'blur',},],
        upiStatus: [{required: true, message: '请选择板料状态！', trigger: 'change',},],
        isDelete: [{required: true, message: '请选择软删除！', trigger: 'change',},],
    });

    /*
     * æ‰“开弹窗
     * @param flag æ ‡è®°ï¼ˆ1新增 2编辑 3查看）
     * @param row  è¡Œæ•°æ®
     */
    const openDialog = async (flag: number,row: any) => {
        // ruleForm.value = JSON.parse(JSON.stringify(row));
        // æ”¹ç”¨detail获取最新数据来编辑
        let rowData = JSON.parse(JSON.stringify(row));
        if (rowData.id)
            ruleForm.value = (await detailMes_Package_Gather(rowData.id)).data.result;
        else {
            ruleForm.value = rowData;
        }
        isShowDialog.value = true;
    };

    // å…³é—­å¼¹çª—
    const closeDialog = () => {
        emit("reloadTable");
        isShowDialog.value = false;
    };

    // å–消
    const cancel = () => {
        isShowDialog.value = false;
    };

    // æäº¤
    const submit = async () => {
        disabled_btn.value = true;
        ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
            if (isValid) {
                loading.value = true;
                let values = ruleForm.value;
                let ret={};
                let title='新增';
                if (ruleForm.value.id == undefined || ruleForm.value.id == null || ruleForm.value.id == "" || ruleForm.value.id == 0) {
                    ret = await addMes_Package_Gather(values);
                } else {
                    title='编辑';
                    ret = await updateMes_Package_Gather(values);
                }
                loading.value = false;
                disabled_btn.value = false;
                if(ret.data.type=="success"){
                    ElMessage.success(title+'成功');
                    closeDialog();
                }
            } else {
                disabled_btn.value = false;
                ElMessage({
                    message: `表单有${Object.keys(fields).length}处验证失败，请修改后再提交`,
                    type: "error",
                });
            }
        });
    };

	





    // é¡µé¢åŠ è½½æ—¶
    onMounted(async () => {
            getEnumAreaCodeData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('AreaCodeEnum')).data.result ?? [];
            getEnumUpiStatusData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiStatusEnum')).data.result ?? [];
    });

    //将属性或者函数暴露给父组件
    defineExpose({ openDialog });
</script>





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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,367 @@
<template>
  <div class="mes_Package_Gather-container">
    <el-card shadow="hover" :body-style="{ paddingBottom: '0' }"> 
      <el-form :model="queryParamsMes_Package_Gather" ref="queryForm" labelWidth="90">
        <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_Package_Gather.searchKey" clearable="" placeholder="包装号,生产单号,批次号,订单号,销售合同单号,第几包,经销店名称,产品名称,客户名称,自提or发货,包装部件总数量,包装面积,创建人,修改人"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
            <el-form-item label="包装号">
              <el-input v-model="queryParamsMes_Package_Gather.packageCode" clearable="" placeholder="请输入包装号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
            <el-form-item label="生产单号">
              <el-input v-model="queryParamsMes_Package_Gather.info5" clearable="" placeholder="请输入生产单号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
            <el-form-item label="批次号">
              <el-input v-model="queryParamsMes_Package_Gather.planNo" clearable="" placeholder="请输入批次号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
            <el-form-item label="订单号">
              <el-input v-model="queryParamsMes_Package_Gather.orderId" clearable="" placeholder="请输入订单号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
            <el-form-item label="所在区域">
              <el-select clearable="" v-model="queryParamsMes_Package_Gather.areaCode" placeholder="请选择所在区域">
                <el-option v-for="(item,index) in getEnumAreaCodeData_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_Package_Gather">
            <el-form-item label="板料状态">
              <el-select clearable="" v-model="queryParamsMes_Package_Gather.upiStatus" placeholder="请选择板料状态">
                <el-option v-for="(item,index) in getEnumUpiStatusData_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_Package_Gather">
            <el-form-item label="纸箱长">
              <el-input v-model="queryParamsMes_Package_Gather.info1" clearable="" placeholder="请输入纸箱长"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
            <el-form-item label="纸箱宽">
              <el-input v-model="queryParamsMes_Package_Gather.info2" clearable="" placeholder="请输入纸箱宽"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
            <el-form-item label="纸箱高">
              <el-input v-model="queryParamsMes_Package_Gather.info3" clearable="" placeholder="请输入纸箱高"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
            <el-form-item label="销售合同单号">
              <el-input v-model="queryParamsMes_Package_Gather.info4" clearable="" placeholder="请输入销售合同单号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
            <el-form-item label="第几包">
              <el-input v-model="queryParamsMes_Package_Gather.info6" clearable="" placeholder="请输入第几包"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
            <el-form-item label="经销店名称">
              <el-input v-model="queryParamsMes_Package_Gather.info7" clearable="" placeholder="请输入经销店名称"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
            <el-form-item label="产品名称">
              <el-input v-model="queryParamsMes_Package_Gather.info8" clearable="" placeholder="请输入产品名称"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
            <el-form-item label="客户名称">
              <el-input v-model="queryParamsMes_Package_Gather.info10" clearable="" placeholder="请输入客户名称"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
            <el-form-item label="自提or发货">
              <el-input v-model="queryParamsMes_Package_Gather.info11" clearable="" placeholder="请输入自提or发货"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
            <el-form-item label="包装部件总数量">
              <el-input v-model="queryParamsMes_Package_Gather.info12" clearable="" placeholder="请输入包装部件总数量"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
            <el-form-item label="包装面积">
              <el-input v-model="queryParamsMes_Package_Gather.info13" 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;">
                <el-button type="primary"  icon="ele-Search" @click="handleQueryMes_Package_Gather" v-auth="'mes_Package_Gather:page'" :disabled="disabled_btnMes_Package_Gather"> æŸ¥è¯¢ </el-button>
                      <el-button icon="ele-Refresh" @click="resetMes_Package_Gather"> é‡ç½® </el-button>
                        <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUIMes_Package_Gather" v-if="!showAdvanceQueryUIMes_Package_Gather" style="margin-left:5px;"> é«˜çº§æŸ¥è¯¢ </el-button>
                        <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUIMes_Package_Gather" v-if="showAdvanceQueryUIMes_Package_Gather" style="margin-left:5px;"> éšè— </el-button>
                <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddMes_Package_Gather" v-auth="'mes_Package_Gather:add'"> æ–°å¢ž </el-button>
                <el-button type="primary" style="margin-left:5px;" icon="ele-Download" @click="handleExportExcelMes_Package_Gather"  v-auth="'mes_Package_Gather:exportExcel'" > å¯¼å‡º </el-button>
              </el-button-group>
            </el-form-item>
            
          </el-col>
        </el-row>
      </el-form>
    </el-card>
    <el-card class="full-table" shadow="hover" style="margin-top: 5px">
      <el-table
                ref="tableRefMes_Package_Gather"
                :data="tableDataMes_Package_Gather"
                style="width: 100%"
                v-loading="loadingMes_Package_Gather"
                tooltip-effect="light"
                                row-key="id"
                @sort-change="sortChangeMes_Package_Gather"
                border="">
        <el-table-column type="index" label="序号" width="55" align="center"/>
        <el-table-column prop="packageCode" label="包装号"  show-overflow-tooltip="" />
        <el-table-column prop="info5" label="生产单号"  show-overflow-tooltip="" />
        <el-table-column prop="planNo" label="批次号"  show-overflow-tooltip="" />
        <el-table-column prop="orderId" label="订单号"  show-overflow-tooltip="" />
          <el-table-column prop="areaCode" label="所在区域"  show-overflow-tooltip="" >
            <template #default="scope">
              <el-tag>{{ getEnumDesc(scope.row.areaCode, getEnumAreaCodeData_Index)}}</el-tag>
            </template>
          </el-table-column>
          <el-table-column prop="upiStatus" label="板料状态"  show-overflow-tooltip="" >
            <template #default="scope">
              <el-tag>{{ getEnumDesc(scope.row.upiStatus, getEnumUpiStatusData_Index)}}</el-tag>
            </template>
          </el-table-column>
        <el-table-column prop="info1" label="纸箱长"  show-overflow-tooltip="" />
        <el-table-column prop="info2" label="纸箱宽"  show-overflow-tooltip="" />
        <el-table-column prop="info3" label="纸箱高"  show-overflow-tooltip="" />
        <el-table-column prop="info4" label="销售合同单号"  show-overflow-tooltip="" />
        <el-table-column prop="info6" label="第几包"  show-overflow-tooltip="" />
        <el-table-column prop="info7" label="经销店名称"  show-overflow-tooltip="" />
        <el-table-column prop="info8" label="产品名称"  show-overflow-tooltip="" />
        <el-table-column prop="info10" label="客户名称"  show-overflow-tooltip="" />
        <el-table-column prop="info11" label="自提or发货"  show-overflow-tooltip="" />
        <el-table-column prop="info12" label="包装部件总数量"  show-overflow-tooltip="" />
        <el-table-column prop="info13" 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 label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('mes_Package_Gather:update') || auth('mes_Package_Gather:delete')">
          <template #default="scope">
            <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMes_Package_Gather(scope.row)" v-auth="'mes_Package_Gather:update'"> ç¼–辑 </el-button>
            <el-button icon="ele-Delete" size="small" text="" type="primary" @click="delMes_Package_Gather(scope.row)" v-auth="'mes_Package_Gather:delete'"> åˆ é™¤ </el-button>
          </template>
        </el-table-column>
      </el-table>
      <el-pagination
                v-model:currentPage="tableParamsMes_Package_Gather.page"
                v-model:page-size="tableParamsMes_Package_Gather.pageSize"
                :total="tableParamsMes_Package_Gather.total"
                :page-sizes="[10, 20, 50, 100, 200, 500]"
                small=""
                background=""
                @size-change="handleSizeChangeMes_Package_Gather"
                @current-change="handleCurrentChangeMes_Package_Gather"
                layout="total, sizes, prev, pager, next, jumper"
    />
      <printDialogMes_Package_Gather
        ref="printDialogRefMes_Package_Gather"
        :title="printMes_Package_GatherTitle"
        @reloadTable="handleQueryMes_Package_Gather" />
      <editDialogMes_Package_Gather
        ref="editDialogRefMes_Package_Gather"
        :title="editMes_Package_GatherTitle"
        @reloadTable="handleQueryMes_Package_Gather"
      />
    </el-card>
  </div>
</template>

<script lang="ts" setup="" name="mes_Package_Gather">
  import { ref,onMounted } from "vue";
  import { ElMessageBox, ElMessage } from "element-plus";
  import { auth } from '/@/utils/authFunction';
  import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
  import { formatDate,formatDate_T_Date,formatDate_T_Time,defaultTimeRange } from '/@/utils/formatTime';
  import { exportPageExcel } from '/@/utils/exportPageExcel' //引入导出方法


  import printDialogMes_Package_Gather from '/@/views/system/print/component/hiprint/preview.vue'
  import editDialogMes_Package_Gather from '/@/views/main/WmsOrder/mes_Package_Gather/component/editDialog.vue'
  import { pageMes_Package_Gather, deleteMes_Package_Gather,importExcelMes_Package_Gather,downloadExcelTemplateMes_Package_Gather } from '/@/api/main/WmsOrder/mes_Package_Gather';
    import { getAPI } from '/@/utils/axios-utils';
    import { SysEnumApi } from '/@/api-services/api';
  import commonFunction from '/@/utils/commonFunction';

  const getEnumAreaCodeData_Index = ref<any>([]);
  const getEnumUpiStatusData_Index = ref<any>([]);

    const { getEnumDesc } = commonFunction();
  
  /***************************************************[包数据操作]开始***************************************************/
  const showAdvanceQueryUIMes_Package_Gather = ref(false);
  const tableRefMes_Package_Gather = ref(null);
  const printDialogRefMes_Package_Gather = ref();
  const editDialogRefMes_Package_Gather = ref();
  const loadingMes_Package_Gather = ref(false);
  const disabled_btnMes_Package_Gather = ref(false);
  const tableDataMes_Package_Gather = ref<any>([]);
  const queryParamsMes_Package_Gather = ref<any>({});
  const tableParamsMes_Package_Gather = ref({
    page: 1,
    pageSize: 10,
    total: 0,
  });

  const printMes_Package_GatherTitle = ref("");
  const editMes_Package_GatherTitle = ref("");

  // æ”¹å˜é«˜çº§æŸ¥è¯¢çš„控件显示状态
  const changeAdvanceQueryUIMes_Package_Gather = () => {
    showAdvanceQueryUIMes_Package_Gather.value = !showAdvanceQueryUIMes_Package_Gather.value;
  }

  // æŸ¥è¯¢åŒ…数据
  const handleQueryMes_Package_Gather = async () => {
    loadingMes_Package_Gather.value = true;
    disabled_btnMes_Package_Gather.value = true;
    var res = await pageMes_Package_Gather(Object.assign(queryParamsMes_Package_Gather.value, tableParamsMes_Package_Gather.value));
    if(res.data.type=="success"){
      tableDataMes_Package_Gather.value = res.data.result?.items ?? [];
      tableParamsMes_Package_Gather.value.total = res.data.result?.total;
    }
    loadingMes_Package_Gather.value = false;
    disabled_btnMes_Package_Gather.value = false;
  };

  // é‡ç½®åŒ…数据查询
  const resetMes_Package_Gather = async () => {
    queryParamsMes_Package_Gather.value = {}
  };

  // åŒ…数据列排序
  const sortChangeMes_Package_Gather = async (column: any) => {
    queryParamsMes_Package_Gather.value.field = column.prop;
    queryParamsMes_Package_Gather.value.order = column.order;
    await handleQueryMes_Package_Gather();
  };

  // æ‰“开新增包数据页面
  const openAddMes_Package_Gather = () => {
    editMes_Package_GatherTitle.value = '添加包数据';
    editDialogRefMes_Package_Gather.value.openDialog(1,{});
  };

  // æ‰“开打印包数据页面
  const openPrintMes_Package_Gather = async (row: any) => {
    printMes_Package_GatherTitle.value = '打印包数据';
  }
  
  // æ‰“开编辑包数据页面
  const openEditMes_Package_Gather = (row: any) => {
    editMes_Package_GatherTitle.value = '编辑包数据';
    editDialogRefMes_Package_Gather.value.openDialog(2,row);
  };

  // åˆ é™¤åŒ…数据
  const delMes_Package_Gather = (row: any) => {
    ElMessageBox.confirm(`确定要删除吗?`, "提示", {
    confirmButtonText: "确定",
    cancelButtonText: "取消",
    type: "warning",
  })
  .then(async () => {
    loadingMes_Package_Gather.value = true;
    var ret = await deleteMes_Package_Gather(row);
    if(ret.data.type=="success"){
        ElMessage.success("删除成功");
    }
    loadingMes_Package_Gather.value = false;
    handleQueryMes_Package_Gather();
  })
  .catch(() => {});
  };

  // æ”¹å˜åŒ…数据页面容量
  const handleSizeChangeMes_Package_Gather = (val: number) => {
    tableParamsMes_Package_Gather.value.pageSize = val;
    handleQueryMes_Package_Gather();
  };

  // æ”¹å˜åŒ…数据页码序号
  const handleCurrentChangeMes_Package_Gather = (val: number) => {
    tableParamsMes_Package_Gather.value.page = val;
    handleQueryMes_Package_Gather();
  };

/***************************************************[包数据操作]结束***************************************************/
/***************************************************[包数据导出]开始***************************************************/
//定义当前页面的方法组
const functionMapMes_Package_Gather = {
      getEnumAreaCodeData_Index,
      getEnumUpiStatusData_Index,
      formatDate_T_Date,
      formatDate_T_Time
};
//点击导出按钮
const handleExportExcelMes_Package_Gather = async (formData:Blob) => {
    loadingMes_Package_Gather.value = true;
    disabled_btnMes_Package_Gather.value = true;
    var new_tableParamsMes_Package_Gather=JSON.parse(JSON.stringify(tableParamsMes_Package_Gather.value));
    new_tableParamsMes_Package_Gather.page = 1;
    new_tableParamsMes_Package_Gather.pageSize = 100000;
    var res = await pageMes_Package_Gather(Object.assign(queryParamsMes_Package_Gather.value, new_tableParamsMes_Package_Gather));
    if(res.data.type=="success"){
      exportExcelMes_Package_Gather(res.data.result?.items ?? []);
    }
    loadingMes_Package_Gather.value = false;
    disabled_btnMes_Package_Gather.value = false;
};
//导出
const exportExcelMes_Package_Gather  = async (exportDataList:Array) => {
  exportPageExcel(exportDataList, tableRefMes_Package_Gather,"包数据",functionMapMes_Package_Gather);
};
/***************************************************[包数据导出]结束***************************************************/
  // åŒ…数据页面加载时
  onMounted(async () => {
    getEnumAreaCodeData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('AreaCodeEnum')).data.result ?? [];
    getEnumUpiStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiStatusEnum')).data.result ?? [];
  });

  handleQueryMes_Package_Gather();
</script>
<style scoped>
:deep(.el-input),
:deep(.el-select),
:deep(.el-input-number) {
    width: 100%;
}
</style>


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,268 @@
<template>
    <div class="mes_Package_LineQueue-container">
        <el-dialog v-model="isShowDialog" :width="800" draggable="" :close-on-click-modal="false">
            <template #header>
                <div style="color: #fff">
                    <!--<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>-->
                    <span>{{ props.title }}</span>
                </div>
            </template>
            <el-form :model="ruleForm" ref="ruleFormRef" label-width="auto" :rules="rules" v-loading="loading">
                <el-row :gutter="35">
                    <el-form-item v-show="false">
                        <el-input v-model="ruleForm.id" />
                    </el-form-item>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="包装号" prop="packageCode">
                            <el-input v-model="ruleForm.packageCode" 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="info5">
                            <el-input v-model="ruleForm.info5" placeholder="请输入生产单号" maxlength="60" 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="planNo">
                            <el-input v-model="ruleForm.planNo" 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="orderId">
                            <el-input v-model="ruleForm.orderId" 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="areaCode">
                            <el-select clearable v-model="ruleForm.areaCode" placeholder="请选择所在区域">
                                <el-option v-for="(item,index) in  getEnumAreaCodeData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
								
                            </el-select>
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="板料状态" prop="upiStatus">
                            <el-select clearable v-model="ruleForm.upiStatus" placeholder="请选择板料状态">
                                <el-option v-for="(item,index) in  getEnumUpiStatusData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
								
                            </el-select>
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="纸箱长" prop="info1">
                            <el-input v-model="ruleForm.info1" placeholder="请输入纸箱长" maxlength="53" 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="info2">
                            <el-input v-model="ruleForm.info2" placeholder="请输入纸箱宽" maxlength="53" 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="info3">
                            <el-input v-model="ruleForm.info3" placeholder="请输入纸箱高" maxlength="53" 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="info4">
                            <el-input v-model="ruleForm.info4" placeholder="请输入销售合同单号" maxlength="60" 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="info6">
                            <el-input v-model="ruleForm.info6" placeholder="请输入第几包" maxlength="60" 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="info7">
                            <el-input v-model="ruleForm.info7" placeholder="请输入经销店名称" maxlength="60" 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="info8">
                            <el-input v-model="ruleForm.info8" placeholder="请输入产品名称" maxlength="60" 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="info10">
                            <el-input v-model="ruleForm.info10" placeholder="请输入客户名称" maxlength="60" 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="自提or发货" prop="info11">
                            <el-input v-model="ruleForm.info11" placeholder="请输入自提or发货" maxlength="60" 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="info12">
                            <el-input v-model="ruleForm.info12" placeholder="请输入包装部件总数量" maxlength="60" 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="info13">
                            <el-input v-model="ruleForm.info13" placeholder="请输入包装面积" maxlength="60" show-word-limit clearable />
							
                        </el-form-item>
						
                    </el-col>
                </el-row>
            </el-form>
            <template #footer>
                <span class="dialog-footer">
                    <el-button @click="cancel">取 æ¶ˆ</el-button>
                    <el-button type="primary" @click="submit" :disabled="disabled_btn">ç¡® å®š</el-button>
                </span>
            </template>
        </el-dialog>
    </div>
</template>
<style scoped>
:deep(.el-select),
:deep(.el-input-number) {
    width: 100%;
}
</style>
<script lang="ts" setup>
    import { ref,onMounted } from "vue";
    import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
    import { ElMessage } from "element-plus";
    import type { FormRules } from "element-plus";
    import { addMes_Package_LineQueue, updateMes_Package_LineQueue, detailMes_Package_LineQueue } from "/@/api/main/WmsOrder/mes_Package_LineQueue";
    import { getAPI } from '/@/utils/axios-utils';
    import { SysEnumApi } from '/@/api-services/api';

    const getEnumAreaCodeData = ref<any>([]);
    const getEnumUpiStatusData = ref<any>([]);
    //父级传递来的参数
    var props = defineProps({
        title: {
        type: String,
        default: "",
    },
    });
    //父级传递来的函数，用于回调
    const emit = defineEmits(["reloadTable"]);
    const ruleFormRef = ref();
    const isShowDialog = ref(false);
    const loading = ref(false);
    const disabled_btn = ref(false);
    const ruleForm = ref<any>({});
    //自行添加其他规则
    const rules = ref<FormRules>({
        packageCode: [{required: true, message: '请输入包装号！', trigger: 'blur',},],
        planNo: [{required: true, message: '请输入批次号！', trigger: 'blur',},],
        orderId: [{required: true, message: '请输入订单号！', trigger: 'blur',},],
        upiStatus: [{required: true, message: '请选择板料状态！', trigger: 'change',},],
        isDelete: [{required: true, message: '请选择软删除！', trigger: 'change',},],
    });

    /*
     * æ‰“开弹窗
     * @param flag æ ‡è®°ï¼ˆ1新增 2编辑 3查看）
     * @param row  è¡Œæ•°æ®
     */
    const openDialog = async (flag: number,row: any) => {
        // ruleForm.value = JSON.parse(JSON.stringify(row));
        // æ”¹ç”¨detail获取最新数据来编辑
        let rowData = JSON.parse(JSON.stringify(row));
        if (rowData.id)
            ruleForm.value = (await detailMes_Package_LineQueue(rowData.id)).data.result;
        else {
            ruleForm.value = rowData;
        }
        isShowDialog.value = true;
    };

    // å…³é—­å¼¹çª—
    const closeDialog = () => {
        emit("reloadTable");
        isShowDialog.value = false;
    };

    // å–消
    const cancel = () => {
        isShowDialog.value = false;
    };

    // æäº¤
    const submit = async () => {
        disabled_btn.value = true;
        ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
            if (isValid) {
                loading.value = true;
                let values = ruleForm.value;
                let ret={};
                let title='新增';
                if (ruleForm.value.id == undefined || ruleForm.value.id == null || ruleForm.value.id == "" || ruleForm.value.id == 0) {
                    ret = await addMes_Package_LineQueue(values);
                } else {
                    title='编辑';
                    ret = await updateMes_Package_LineQueue(values);
                }
                loading.value = false;
                disabled_btn.value = false;
                if(ret.data.type=="success"){
                    ElMessage.success(title+'成功');
                    closeDialog();
                }
            } else {
                disabled_btn.value = false;
                ElMessage({
                    message: `表单有${Object.keys(fields).length}处验证失败，请修改后再提交`,
                    type: "error",
                });
            }
        });
    };

	





    // é¡µé¢åŠ è½½æ—¶
    onMounted(async () => {
            getEnumAreaCodeData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('AreaCodeEnum')).data.result ?? [];
            getEnumUpiStatusData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiStatusEnum')).data.result ?? [];
    });

    //将属性或者函数暴露给父组件
    defineExpose({ openDialog });
</script>





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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,367 @@
<template>
  <div class="mes_Package_LineQueue-container">
    <el-card shadow="hover" :body-style="{ paddingBottom: '0' }"> 
      <el-form :model="queryParamsMes_Package_LineQueue" ref="queryForm" labelWidth="90">
        <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_Package_LineQueue.searchKey" clearable="" placeholder="包装号,生产单号,批次号,订单号,销售合同单号,第几包,经销店名称,产品名称,客户名称,自提or发货,包装部件总数量,包装面积,创建人,修改人"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_LineQueue">
            <el-form-item label="包装号">
              <el-input v-model="queryParamsMes_Package_LineQueue.packageCode" clearable="" placeholder="请输入包装号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_LineQueue">
            <el-form-item label="生产单号">
              <el-input v-model="queryParamsMes_Package_LineQueue.info5" clearable="" placeholder="请输入生产单号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_LineQueue">
            <el-form-item label="批次号">
              <el-input v-model="queryParamsMes_Package_LineQueue.planNo" clearable="" placeholder="请输入批次号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_LineQueue">
            <el-form-item label="订单号">
              <el-input v-model="queryParamsMes_Package_LineQueue.orderId" clearable="" placeholder="请输入订单号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_LineQueue">
            <el-form-item label="所在区域">
              <el-select clearable="" v-model="queryParamsMes_Package_LineQueue.areaCode" placeholder="请选择所在区域">
                <el-option v-for="(item,index) in getEnumAreaCodeData_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_Package_LineQueue">
            <el-form-item label="板料状态">
              <el-select clearable="" v-model="queryParamsMes_Package_LineQueue.upiStatus" placeholder="请选择板料状态">
                <el-option v-for="(item,index) in getEnumUpiStatusData_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_Package_LineQueue">
            <el-form-item label="纸箱长">
              <el-input v-model="queryParamsMes_Package_LineQueue.info1" clearable="" placeholder="请输入纸箱长"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_LineQueue">
            <el-form-item label="纸箱宽">
              <el-input v-model="queryParamsMes_Package_LineQueue.info2" clearable="" placeholder="请输入纸箱宽"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_LineQueue">
            <el-form-item label="纸箱高">
              <el-input v-model="queryParamsMes_Package_LineQueue.info3" clearable="" placeholder="请输入纸箱高"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_LineQueue">
            <el-form-item label="销售合同单号">
              <el-input v-model="queryParamsMes_Package_LineQueue.info4" clearable="" placeholder="请输入销售合同单号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_LineQueue">
            <el-form-item label="第几包">
              <el-input v-model="queryParamsMes_Package_LineQueue.info6" clearable="" placeholder="请输入第几包"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_LineQueue">
            <el-form-item label="经销店名称">
              <el-input v-model="queryParamsMes_Package_LineQueue.info7" clearable="" placeholder="请输入经销店名称"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_LineQueue">
            <el-form-item label="产品名称">
              <el-input v-model="queryParamsMes_Package_LineQueue.info8" clearable="" placeholder="请输入产品名称"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_LineQueue">
            <el-form-item label="客户名称">
              <el-input v-model="queryParamsMes_Package_LineQueue.info10" clearable="" placeholder="请输入客户名称"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_LineQueue">
            <el-form-item label="自提or发货">
              <el-input v-model="queryParamsMes_Package_LineQueue.info11" clearable="" placeholder="请输入自提or发货"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_LineQueue">
            <el-form-item label="包装部件总数量">
              <el-input v-model="queryParamsMes_Package_LineQueue.info12" clearable="" placeholder="请输入包装部件总数量"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_LineQueue">
            <el-form-item label="包装面积">
              <el-input v-model="queryParamsMes_Package_LineQueue.info13" 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;">
                <el-button type="primary"  icon="ele-Search" @click="handleQueryMes_Package_LineQueue" v-auth="'mes_Package_LineQueue:page'" :disabled="disabled_btnMes_Package_LineQueue"> æŸ¥è¯¢ </el-button>
                      <el-button icon="ele-Refresh" @click="resetMes_Package_LineQueue"> é‡ç½® </el-button>
                        <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUIMes_Package_LineQueue" v-if="!showAdvanceQueryUIMes_Package_LineQueue" style="margin-left:5px;"> é«˜çº§æŸ¥è¯¢ </el-button>
                        <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUIMes_Package_LineQueue" v-if="showAdvanceQueryUIMes_Package_LineQueue" style="margin-left:5px;"> éšè— </el-button>
                <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddMes_Package_LineQueue" v-auth="'mes_Package_LineQueue:add'"> æ–°å¢ž </el-button>
                <el-button type="primary" style="margin-left:5px;" icon="ele-Download" @click="handleExportExcelMes_Package_LineQueue"  v-auth="'mes_Package_LineQueue:exportExcel'" > å¯¼å‡º </el-button>
              </el-button-group>
            </el-form-item>
            
          </el-col>
        </el-row>
      </el-form>
    </el-card>
    <el-card class="full-table" shadow="hover" style="margin-top: 5px">
      <el-table
                ref="tableRefMes_Package_LineQueue"
                :data="tableDataMes_Package_LineQueue"
                style="width: 100%"
                v-loading="loadingMes_Package_LineQueue"
                tooltip-effect="light"
                                row-key="id"
                @sort-change="sortChangeMes_Package_LineQueue"
                border="">
        <el-table-column type="index" label="序号" width="55" align="center"/>
        <el-table-column prop="packageCode" label="包装号"  show-overflow-tooltip="" />
        <el-table-column prop="info5" label="生产单号"  show-overflow-tooltip="" />
        <el-table-column prop="planNo" label="批次号"  show-overflow-tooltip="" />
        <el-table-column prop="orderId" label="订单号"  show-overflow-tooltip="" />
          <el-table-column prop="areaCode" label="所在区域"  show-overflow-tooltip="" >
            <template #default="scope">
              <el-tag>{{ getEnumDesc(scope.row.areaCode, getEnumAreaCodeData_Index)}}</el-tag>
            </template>
          </el-table-column>
          <el-table-column prop="upiStatus" label="板料状态"  show-overflow-tooltip="" >
            <template #default="scope">
              <el-tag>{{ getEnumDesc(scope.row.upiStatus, getEnumUpiStatusData_Index)}}</el-tag>
            </template>
          </el-table-column>
        <el-table-column prop="info1" label="纸箱长"  show-overflow-tooltip="" />
        <el-table-column prop="info2" label="纸箱宽"  show-overflow-tooltip="" />
        <el-table-column prop="info3" label="纸箱高"  show-overflow-tooltip="" />
        <el-table-column prop="info4" label="销售合同单号"  show-overflow-tooltip="" />
        <el-table-column prop="info6" label="第几包"  show-overflow-tooltip="" />
        <el-table-column prop="info7" label="经销店名称"  show-overflow-tooltip="" />
        <el-table-column prop="info8" label="产品名称"  show-overflow-tooltip="" />
        <el-table-column prop="info10" label="客户名称"  show-overflow-tooltip="" />
        <el-table-column prop="info11" label="自提or发货"  show-overflow-tooltip="" />
        <el-table-column prop="info12" label="包装部件总数量"  show-overflow-tooltip="" />
        <el-table-column prop="info13" 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 label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('mes_Package_LineQueue:update') || auth('mes_Package_LineQueue:delete')">
          <template #default="scope">
            <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMes_Package_LineQueue(scope.row)" v-auth="'mes_Package_LineQueue:update'"> ç¼–辑 </el-button>
            <el-button icon="ele-Delete" size="small" text="" type="primary" @click="delMes_Package_LineQueue(scope.row)" v-auth="'mes_Package_LineQueue:delete'"> åˆ é™¤ </el-button>
          </template>
        </el-table-column>
      </el-table>
      <el-pagination
                v-model:currentPage="tableParamsMes_Package_LineQueue.page"
                v-model:page-size="tableParamsMes_Package_LineQueue.pageSize"
                :total="tableParamsMes_Package_LineQueue.total"
                :page-sizes="[10, 20, 50, 100, 200, 500]"
                small=""
                background=""
                @size-change="handleSizeChangeMes_Package_LineQueue"
                @current-change="handleCurrentChangeMes_Package_LineQueue"
                layout="total, sizes, prev, pager, next, jumper"
    />
      <printDialogMes_Package_LineQueue
        ref="printDialogRefMes_Package_LineQueue"
        :title="printMes_Package_LineQueueTitle"
        @reloadTable="handleQueryMes_Package_LineQueue" />
      <editDialogMes_Package_LineQueue
        ref="editDialogRefMes_Package_LineQueue"
        :title="editMes_Package_LineQueueTitle"
        @reloadTable="handleQueryMes_Package_LineQueue"
      />
    </el-card>
  </div>
</template>

<script lang="ts" setup="" name="mes_Package_LineQueue">
  import { ref,onMounted } from "vue";
  import { ElMessageBox, ElMessage } from "element-plus";
  import { auth } from '/@/utils/authFunction';
  import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
  import { formatDate,formatDate_T_Date,formatDate_T_Time,defaultTimeRange } from '/@/utils/formatTime';
  import { exportPageExcel } from '/@/utils/exportPageExcel' //引入导出方法


  import printDialogMes_Package_LineQueue from '/@/views/system/print/component/hiprint/preview.vue'
  import editDialogMes_Package_LineQueue from '/@/views/main/WmsOrder/mes_Package_LineQueue/component/editDialog.vue'
  import { pageMes_Package_LineQueue, deleteMes_Package_LineQueue,importExcelMes_Package_LineQueue,downloadExcelTemplateMes_Package_LineQueue } from '/@/api/main/WmsOrder/mes_Package_LineQueue';
    import { getAPI } from '/@/utils/axios-utils';
    import { SysEnumApi } from '/@/api-services/api';
  import commonFunction from '/@/utils/commonFunction';

  const getEnumAreaCodeData_Index = ref<any>([]);
  const getEnumUpiStatusData_Index = ref<any>([]);

    const { getEnumDesc } = commonFunction();
  
  /***************************************************[包队列数据操作]开始***************************************************/
  const showAdvanceQueryUIMes_Package_LineQueue = ref(false);
  const tableRefMes_Package_LineQueue = ref(null);
  const printDialogRefMes_Package_LineQueue = ref();
  const editDialogRefMes_Package_LineQueue = ref();
  const loadingMes_Package_LineQueue = ref(false);
  const disabled_btnMes_Package_LineQueue = ref(false);
  const tableDataMes_Package_LineQueue = ref<any>([]);
  const queryParamsMes_Package_LineQueue = ref<any>({});
  const tableParamsMes_Package_LineQueue = ref({
    page: 1,
    pageSize: 10,
    total: 0,
  });

  const printMes_Package_LineQueueTitle = ref("");
  const editMes_Package_LineQueueTitle = ref("");

  // æ”¹å˜é«˜çº§æŸ¥è¯¢çš„控件显示状态
  const changeAdvanceQueryUIMes_Package_LineQueue = () => {
    showAdvanceQueryUIMes_Package_LineQueue.value = !showAdvanceQueryUIMes_Package_LineQueue.value;
  }

  // æŸ¥è¯¢åŒ…队列数据
  const handleQueryMes_Package_LineQueue = async () => {
    loadingMes_Package_LineQueue.value = true;
    disabled_btnMes_Package_LineQueue.value = true;
    var res = await pageMes_Package_LineQueue(Object.assign(queryParamsMes_Package_LineQueue.value, tableParamsMes_Package_LineQueue.value));
    if(res.data.type=="success"){
      tableDataMes_Package_LineQueue.value = res.data.result?.items ?? [];
      tableParamsMes_Package_LineQueue.value.total = res.data.result?.total;
    }
    loadingMes_Package_LineQueue.value = false;
    disabled_btnMes_Package_LineQueue.value = false;
  };

  // é‡ç½®åŒ…队列数据查询
  const resetMes_Package_LineQueue = async () => {
    queryParamsMes_Package_LineQueue.value = {}
  };

  // åŒ…队列数据列排序
  const sortChangeMes_Package_LineQueue = async (column: any) => {
    queryParamsMes_Package_LineQueue.value.field = column.prop;
    queryParamsMes_Package_LineQueue.value.order = column.order;
    await handleQueryMes_Package_LineQueue();
  };

  // æ‰“开新增包队列数据页面
  const openAddMes_Package_LineQueue = () => {
    editMes_Package_LineQueueTitle.value = '添加包队列数据';
    editDialogRefMes_Package_LineQueue.value.openDialog(1,{});
  };

  // æ‰“开打印包队列数据页面
  const openPrintMes_Package_LineQueue = async (row: any) => {
    printMes_Package_LineQueueTitle.value = '打印包队列数据';
  }
  
  // æ‰“开编辑包队列数据页面
  const openEditMes_Package_LineQueue = (row: any) => {
    editMes_Package_LineQueueTitle.value = '编辑包队列数据';
    editDialogRefMes_Package_LineQueue.value.openDialog(2,row);
  };

  // åˆ é™¤åŒ…队列数据
  const delMes_Package_LineQueue = (row: any) => {
    ElMessageBox.confirm(`确定要删除吗?`, "提示", {
    confirmButtonText: "确定",
    cancelButtonText: "取消",
    type: "warning",
  })
  .then(async () => {
    loadingMes_Package_LineQueue.value = true;
    var ret = await deleteMes_Package_LineQueue(row);
    if(ret.data.type=="success"){
        ElMessage.success("删除成功");
    }
    loadingMes_Package_LineQueue.value = false;
    handleQueryMes_Package_LineQueue();
  })
  .catch(() => {});
  };

  // æ”¹å˜åŒ…队列数据页面容量
  const handleSizeChangeMes_Package_LineQueue = (val: number) => {
    tableParamsMes_Package_LineQueue.value.pageSize = val;
    handleQueryMes_Package_LineQueue();
  };

  // æ”¹å˜åŒ…队列数据页码序号
  const handleCurrentChangeMes_Package_LineQueue = (val: number) => {
    tableParamsMes_Package_LineQueue.value.page = val;
    handleQueryMes_Package_LineQueue();
  };

/***************************************************[包队列数据操作]结束***************************************************/
/***************************************************[包队列数据导出]开始***************************************************/
//定义当前页面的方法组
const functionMapMes_Package_LineQueue = {
      getEnumAreaCodeData_Index,
      getEnumUpiStatusData_Index,
      formatDate_T_Date,
      formatDate_T_Time
};
//点击导出按钮
const handleExportExcelMes_Package_LineQueue = async (formData:Blob) => {
    loadingMes_Package_LineQueue.value = true;
    disabled_btnMes_Package_LineQueue.value = true;
    var new_tableParamsMes_Package_LineQueue=JSON.parse(JSON.stringify(tableParamsMes_Package_LineQueue.value));
    new_tableParamsMes_Package_LineQueue.page = 1;
    new_tableParamsMes_Package_LineQueue.pageSize = 100000;
    var res = await pageMes_Package_LineQueue(Object.assign(queryParamsMes_Package_LineQueue.value, new_tableParamsMes_Package_LineQueue));
    if(res.data.type=="success"){
      exportExcelMes_Package_LineQueue(res.data.result?.items ?? []);
    }
    loadingMes_Package_LineQueue.value = false;
    disabled_btnMes_Package_LineQueue.value = false;
};
//导出
const exportExcelMes_Package_LineQueue  = async (exportDataList:Array) => {
  exportPageExcel(exportDataList, tableRefMes_Package_LineQueue,"包队列数据",functionMapMes_Package_LineQueue);
};
/***************************************************[包队列数据导出]结束***************************************************/
  // åŒ…队列数据页面加载时
  onMounted(async () => {
    getEnumAreaCodeData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('AreaCodeEnum')).data.result ?? [];
    getEnumUpiStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiStatusEnum')).data.result ?? [];
  });

  handleQueryMes_Package_LineQueue();
</script>
<style scoped>
:deep(.el-input),
:deep(.el-select),
:deep(.el-input-number) {
    width: 100%;
}
</style>


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,268 @@
<template>
    <div class="validateQiTaoOutput-container">
        <el-dialog v-model="isShowDialog" :width="800" draggable="" :close-on-click-modal="false">
            <template #header>
                <div style="color: #fff">
                    <!--<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>-->
                    <span>{{ props.title }}</span>
                </div>
            </template>
            <el-form :model="ruleForm" ref="ruleFormRef" label-width="auto" :rules="rules" v-loading="loading">
                <el-row :gutter="35">
                    <el-form-item v-show="false">
                        <el-input v-model="ruleForm.id" />
                    </el-form-item>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="包装号" prop="packageCode">
                            <el-input v-model="ruleForm.packageCode" 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="info5">
                            <el-input v-model="ruleForm.info5" placeholder="请输入生产单号" maxlength="60" 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="planNo">
                            <el-input v-model="ruleForm.planNo" 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="orderId">
                            <el-input v-model="ruleForm.orderId" 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="areaCode">
                            <el-select clearable v-model="ruleForm.areaCode" placeholder="请选择所在区域">
                                <el-option v-for="(item,index) in  getEnumAreaCodeData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
								
                            </el-select>
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="板料状态" prop="upiStatus">
                            <el-select clearable v-model="ruleForm.upiStatus" placeholder="请选择板料状态">
                                <el-option v-for="(item,index) in  getEnumUpiStatusData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
								
                            </el-select>
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="纸箱长" prop="info1">
                            <el-input v-model="ruleForm.info1" placeholder="请输入纸箱长" maxlength="53" 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="info2">
                            <el-input v-model="ruleForm.info2" placeholder="请输入纸箱宽" maxlength="53" 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="info3">
                            <el-input v-model="ruleForm.info3" placeholder="请输入纸箱高" maxlength="53" 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="info4">
                            <el-input v-model="ruleForm.info4" placeholder="请输入销售合同单号" maxlength="60" 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="info6">
                            <el-input v-model="ruleForm.info6" placeholder="请输入第几包" maxlength="60" 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="info7">
                            <el-input v-model="ruleForm.info7" placeholder="请输入经销店名称" maxlength="60" 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="info8">
                            <el-input v-model="ruleForm.info8" placeholder="请输入产品名称" maxlength="60" 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="info10">
                            <el-input v-model="ruleForm.info10" placeholder="请输入客户名称" maxlength="60" 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="自提or发货" prop="info11">
                            <el-input v-model="ruleForm.info11" placeholder="请输入自提or发货" maxlength="60" 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="info12">
                            <el-input v-model="ruleForm.info12" placeholder="请输入包装部件总数量" maxlength="60" 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="info13">
                            <el-input v-model="ruleForm.info13" placeholder="请输入包装面积" maxlength="60" show-word-limit clearable />
							
                        </el-form-item>
						
                    </el-col>
                </el-row>
            </el-form>
            <template #footer>
                <span class="dialog-footer">
                    <el-button @click="cancel">取 æ¶ˆ</el-button>
                    <el-button type="primary" @click="submit" :disabled="disabled_btn">ç¡® å®š</el-button>
                </span>
            </template>
        </el-dialog>
    </div>
</template>
<style scoped>
:deep(.el-select),
:deep(.el-input-number) {
    width: 100%;
}
</style>
<script lang="ts" setup>
    import { ref,onMounted } from "vue";
    import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
    import { ElMessage } from "element-plus";
    import type { FormRules } from "element-plus";
    import { addValidateQiTaoOutput, updateValidateQiTaoOutput, detailValidateQiTaoOutput } from "/@/api/main/WmsOrder/validateQiTaoOutput";
    import { getAPI } from '/@/utils/axios-utils';
    import { SysEnumApi } from '/@/api-services/api';

    const getEnumAreaCodeData = ref<any>([]);
    const getEnumUpiStatusData = ref<any>([]);
    //父级传递来的参数
    var props = defineProps({
        title: {
        type: String,
        default: "",
    },
    });
    //父级传递来的函数，用于回调
    const emit = defineEmits(["reloadTable"]);
    const ruleFormRef = ref();
    const isShowDialog = ref(false);
    const loading = ref(false);
    const disabled_btn = ref(false);
    const ruleForm = ref<any>({});
    //自行添加其他规则
    const rules = ref<FormRules>({
        packageCode: [{required: true, message: '请输入包装号！', trigger: 'blur',},],
        planNo: [{required: true, message: '请输入批次号！', trigger: 'blur',},],
        orderId: [{required: true, message: '请输入订单号！', trigger: 'blur',},],
        upiStatus: [{required: true, message: '请选择板料状态！', trigger: 'change',},],
        isDelete: [{required: true, message: '请选择软删除！', trigger: 'change',},],
    });

    /*
     * æ‰“开弹窗
     * @param flag æ ‡è®°ï¼ˆ1新增 2编辑 3查看）
     * @param row  è¡Œæ•°æ®
     */
    const openDialog = async (flag: number,row: any) => {
        // ruleForm.value = JSON.parse(JSON.stringify(row));
        // æ”¹ç”¨detail获取最新数据来编辑
        let rowData = JSON.parse(JSON.stringify(row));
        if (rowData.id)
            ruleForm.value = (await detailValidateQiTaoOutput(rowData.id)).data.result;
        else {
            ruleForm.value = rowData;
        }
        isShowDialog.value = true;
    };

    // å…³é—­å¼¹çª—
    const closeDialog = () => {
        emit("reloadTable");
        isShowDialog.value = false;
    };

    // å–消
    const cancel = () => {
        isShowDialog.value = false;
    };

    // æäº¤
    const submit = async () => {
        disabled_btn.value = true;
        ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
            if (isValid) {
                loading.value = true;
                let values = ruleForm.value;
                let ret={};
                let title='新增';
                if (ruleForm.value.id == undefined || ruleForm.value.id == null || ruleForm.value.id == "" || ruleForm.value.id == 0) {
                    ret = await addValidateQiTaoOutput(values);
                } else {
                    title='编辑';
                    ret = await updateValidateQiTaoOutput(values);
                }
                loading.value = false;
                disabled_btn.value = false;
                if(ret.data.type=="success"){
                    ElMessage.success(title+'成功');
                    closeDialog();
                }
            } else {
                disabled_btn.value = false;
                ElMessage({
                    message: `表单有${Object.keys(fields).length}处验证失败，请修改后再提交`,
                    type: "error",
                });
            }
        });
    };

	





    // é¡µé¢åŠ è½½æ—¶
    onMounted(async () => {
            getEnumAreaCodeData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('AreaCodeEnum')).data.result ?? [];
            getEnumUpiStatusData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiStatusEnum')).data.result ?? [];
    });

    //将属性或者函数暴露给父组件
    defineExpose({ openDialog });
</script>





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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,367 @@
<template>
  <div class="validateQiTaoOutput-container">
    <el-card shadow="hover" :body-style="{ paddingBottom: '0' }"> 
      <el-form :model="queryParamsValidateQiTaoOutput" ref="queryForm" labelWidth="90">
        <el-row>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
            <el-form-item label="关键字">
              <el-input v-model="queryParamsValidateQiTaoOutput.searchKey" clearable="" placeholder="包装号,生产单号,批次号,订单号,销售合同单号,第几包,经销店名称,产品名称,客户名称,自提or发货,包装部件总数量,包装面积,创建人,修改人"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIValidateQiTaoOutput">
            <el-form-item label="包装号">
              <el-input v-model="queryParamsValidateQiTaoOutput.packageCode" clearable="" placeholder="请输入包装号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIValidateQiTaoOutput">
            <el-form-item label="生产单号">
              <el-input v-model="queryParamsValidateQiTaoOutput.info5" clearable="" placeholder="请输入生产单号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIValidateQiTaoOutput">
            <el-form-item label="批次号">
              <el-input v-model="queryParamsValidateQiTaoOutput.planNo" clearable="" placeholder="请输入批次号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIValidateQiTaoOutput">
            <el-form-item label="订单号">
              <el-input v-model="queryParamsValidateQiTaoOutput.orderId" clearable="" placeholder="请输入订单号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIValidateQiTaoOutput">
            <el-form-item label="所在区域">
              <el-select clearable="" v-model="queryParamsValidateQiTaoOutput.areaCode" placeholder="请选择所在区域">
                <el-option v-for="(item,index) in getEnumAreaCodeData_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="showAdvanceQueryUIValidateQiTaoOutput">
            <el-form-item label="板料状态">
              <el-select clearable="" v-model="queryParamsValidateQiTaoOutput.upiStatus" placeholder="请选择板料状态">
                <el-option v-for="(item,index) in getEnumUpiStatusData_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="showAdvanceQueryUIValidateQiTaoOutput">
            <el-form-item label="纸箱长">
              <el-input v-model="queryParamsValidateQiTaoOutput.info1" clearable="" placeholder="请输入纸箱长"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIValidateQiTaoOutput">
            <el-form-item label="纸箱宽">
              <el-input v-model="queryParamsValidateQiTaoOutput.info2" clearable="" placeholder="请输入纸箱宽"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIValidateQiTaoOutput">
            <el-form-item label="纸箱高">
              <el-input v-model="queryParamsValidateQiTaoOutput.info3" clearable="" placeholder="请输入纸箱高"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIValidateQiTaoOutput">
            <el-form-item label="销售合同单号">
              <el-input v-model="queryParamsValidateQiTaoOutput.info4" clearable="" placeholder="请输入销售合同单号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIValidateQiTaoOutput">
            <el-form-item label="第几包">
              <el-input v-model="queryParamsValidateQiTaoOutput.info6" clearable="" placeholder="请输入第几包"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIValidateQiTaoOutput">
            <el-form-item label="经销店名称">
              <el-input v-model="queryParamsValidateQiTaoOutput.info7" clearable="" placeholder="请输入经销店名称"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIValidateQiTaoOutput">
            <el-form-item label="产品名称">
              <el-input v-model="queryParamsValidateQiTaoOutput.info8" clearable="" placeholder="请输入产品名称"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIValidateQiTaoOutput">
            <el-form-item label="客户名称">
              <el-input v-model="queryParamsValidateQiTaoOutput.info10" clearable="" placeholder="请输入客户名称"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIValidateQiTaoOutput">
            <el-form-item label="自提or发货">
              <el-input v-model="queryParamsValidateQiTaoOutput.info11" clearable="" placeholder="请输入自提or发货"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIValidateQiTaoOutput">
            <el-form-item label="包装部件总数量">
              <el-input v-model="queryParamsValidateQiTaoOutput.info12" clearable="" placeholder="请输入包装部件总数量"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIValidateQiTaoOutput">
            <el-form-item label="包装面积">
              <el-input v-model="queryParamsValidateQiTaoOutput.info13" 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;">
                <el-button type="primary"  icon="ele-Search" @click="handleQueryValidateQiTaoOutput" v-auth="'validateQiTaoOutput:page'" :disabled="disabled_btnValidateQiTaoOutput"> æŸ¥è¯¢ </el-button>
                      <el-button icon="ele-Refresh" @click="resetValidateQiTaoOutput"> é‡ç½® </el-button>
                        <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUIValidateQiTaoOutput" v-if="!showAdvanceQueryUIValidateQiTaoOutput" style="margin-left:5px;"> é«˜çº§æŸ¥è¯¢ </el-button>
                        <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUIValidateQiTaoOutput" v-if="showAdvanceQueryUIValidateQiTaoOutput" style="margin-left:5px;"> éšè— </el-button>
                <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddValidateQiTaoOutput" v-auth="'validateQiTaoOutput:add'"> æ–°å¢ž </el-button>
                <el-button type="primary" style="margin-left:5px;" icon="ele-Download" @click="handleExportExcelValidateQiTaoOutput"  v-auth="'validateQiTaoOutput:exportExcel'" > å¯¼å‡º </el-button>
              </el-button-group>
            </el-form-item>
            
          </el-col>
        </el-row>
      </el-form>
    </el-card>
    <el-card class="full-table" shadow="hover" style="margin-top: 5px">
      <el-table
                ref="tableRefValidateQiTaoOutput"
                :data="tableDataValidateQiTaoOutput"
                style="width: 100%"
                v-loading="loadingValidateQiTaoOutput"
                tooltip-effect="light"
                                row-key="id"
                @sort-change="sortChangeValidateQiTaoOutput"
                border="">
        <el-table-column type="index" label="序号" width="55" align="center"/>
        <el-table-column prop="packageCode" label="包装号"  show-overflow-tooltip="" />
        <el-table-column prop="info5" label="生产单号"  show-overflow-tooltip="" />
        <el-table-column prop="planNo" label="批次号"  show-overflow-tooltip="" />
        <el-table-column prop="orderId" label="订单号"  show-overflow-tooltip="" />
          <el-table-column prop="areaCode" label="所在区域"  show-overflow-tooltip="" >
            <template #default="scope">
              <el-tag>{{ getEnumDesc(scope.row.areaCode, getEnumAreaCodeData_Index)}}</el-tag>
            </template>
          </el-table-column>
          <el-table-column prop="upiStatus" label="板料状态"  show-overflow-tooltip="" >
            <template #default="scope">
              <el-tag>{{ getEnumDesc(scope.row.upiStatus, getEnumUpiStatusData_Index)}}</el-tag>
            </template>
          </el-table-column>
        <el-table-column prop="info1" label="纸箱长"  show-overflow-tooltip="" />
        <el-table-column prop="info2" label="纸箱宽"  show-overflow-tooltip="" />
        <el-table-column prop="info3" label="纸箱高"  show-overflow-tooltip="" />
        <el-table-column prop="info4" label="销售合同单号"  show-overflow-tooltip="" />
        <el-table-column prop="info6" label="第几包"  show-overflow-tooltip="" />
        <el-table-column prop="info7" label="经销店名称"  show-overflow-tooltip="" />
        <el-table-column prop="info8" label="产品名称"  show-overflow-tooltip="" />
        <el-table-column prop="info10" label="客户名称"  show-overflow-tooltip="" />
        <el-table-column prop="info11" label="自提or发货"  show-overflow-tooltip="" />
        <el-table-column prop="info12" label="包装部件总数量"  show-overflow-tooltip="" />
        <el-table-column prop="info13" 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 label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('validateQiTaoOutput:update') || auth('validateQiTaoOutput:delete')">
          <template #default="scope">
            <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditValidateQiTaoOutput(scope.row)" v-auth="'validateQiTaoOutput:update'"> ç¼–辑 </el-button>
            <el-button icon="ele-Delete" size="small" text="" type="primary" @click="delValidateQiTaoOutput(scope.row)" v-auth="'validateQiTaoOutput:delete'"> åˆ é™¤ </el-button>
          </template>
        </el-table-column>
      </el-table>
      <el-pagination
                v-model:currentPage="tableParamsValidateQiTaoOutput.page"
                v-model:page-size="tableParamsValidateQiTaoOutput.pageSize"
                :total="tableParamsValidateQiTaoOutput.total"
                :page-sizes="[10, 20, 50, 100, 200, 500]"
                small=""
                background=""
                @size-change="handleSizeChangeValidateQiTaoOutput"
                @current-change="handleCurrentChangeValidateQiTaoOutput"
                layout="total, sizes, prev, pager, next, jumper"
    />
      <printDialogValidateQiTaoOutput
        ref="printDialogRefValidateQiTaoOutput"
        :title="printValidateQiTaoOutputTitle"
        @reloadTable="handleQueryValidateQiTaoOutput" />
      <editDialogValidateQiTaoOutput
        ref="editDialogRefValidateQiTaoOutput"
        :title="editValidateQiTaoOutputTitle"
        @reloadTable="handleQueryValidateQiTaoOutput"
      />
    </el-card>
  </div>
</template>

<script lang="ts" setup="" name="validateQiTaoOutput">
  import { ref,onMounted } from "vue";
  import { ElMessageBox, ElMessage } from "element-plus";
  import { auth } from '/@/utils/authFunction';
  import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
  import { formatDate,formatDate_T_Date,formatDate_T_Time,defaultTimeRange } from '/@/utils/formatTime';
  import { exportPageExcel } from '/@/utils/exportPageExcel' //引入导出方法


  import printDialogValidateQiTaoOutput from '/@/views/system/print/component/hiprint/preview.vue'
  import editDialogValidateQiTaoOutput from '/@/views/main/WmsOrder/validateQiTaoOutput/component/editDialog.vue'
  import { pageValidateQiTaoOutput, deleteValidateQiTaoOutput,importExcelValidateQiTaoOutput,downloadExcelTemplateValidateQiTaoOutput } from '/@/api/main/WmsOrder/validateQiTaoOutput';
    import { getAPI } from '/@/utils/axios-utils';
    import { SysEnumApi } from '/@/api-services/api';
  import commonFunction from '/@/utils/commonFunction';

  const getEnumAreaCodeData_Index = ref<any>([]);
  const getEnumUpiStatusData_Index = ref<any>([]);

    const { getEnumDesc } = commonFunction();
  
  /***************************************************[包数据操作]开始***************************************************/
  const showAdvanceQueryUIValidateQiTaoOutput = ref(false);
  const tableRefValidateQiTaoOutput = ref(null);
  const printDialogRefValidateQiTaoOutput = ref();
  const editDialogRefValidateQiTaoOutput = ref();
  const loadingValidateQiTaoOutput = ref(false);
  const disabled_btnValidateQiTaoOutput = ref(false);
  const tableDataValidateQiTaoOutput = ref<any>([]);
  const queryParamsValidateQiTaoOutput = ref<any>({});
  const tableParamsValidateQiTaoOutput = ref({
    page: 1,
    pageSize: 10,
    total: 0,
  });

  const printValidateQiTaoOutputTitle = ref("");
  const editValidateQiTaoOutputTitle = ref("");

  // æ”¹å˜é«˜çº§æŸ¥è¯¢çš„控件显示状态
  const changeAdvanceQueryUIValidateQiTaoOutput = () => {
    showAdvanceQueryUIValidateQiTaoOutput.value = !showAdvanceQueryUIValidateQiTaoOutput.value;
  }

  // æŸ¥è¯¢åŒ…数据
  const handleQueryValidateQiTaoOutput = async () => {
    loadingValidateQiTaoOutput.value = true;
    disabled_btnValidateQiTaoOutput.value = true;
    var res = await pageValidateQiTaoOutput(Object.assign(queryParamsValidateQiTaoOutput.value, tableParamsValidateQiTaoOutput.value));
    if(res.data.type=="success"){
      tableDataValidateQiTaoOutput.value = res.data.result?.items ?? [];
      tableParamsValidateQiTaoOutput.value.total = res.data.result?.total;
    }
    loadingValidateQiTaoOutput.value = false;
    disabled_btnValidateQiTaoOutput.value = false;
  };

  // é‡ç½®åŒ…数据查询
  const resetValidateQiTaoOutput = async () => {
    queryParamsValidateQiTaoOutput.value = {}
  };

  // åŒ…数据列排序
  const sortChangeValidateQiTaoOutput = async (column: any) => {
    queryParamsValidateQiTaoOutput.value.field = column.prop;
    queryParamsValidateQiTaoOutput.value.order = column.order;
    await handleQueryValidateQiTaoOutput();
  };

  // æ‰“开新增包数据页面
  const openAddValidateQiTaoOutput = () => {
    editValidateQiTaoOutputTitle.value = '添加包数据';
    editDialogRefValidateQiTaoOutput.value.openDialog(1,{});
  };

  // æ‰“开打印包数据页面
  const openPrintValidateQiTaoOutput = async (row: any) => {
    printValidateQiTaoOutputTitle.value = '打印包数据';
  }
  
  // æ‰“开编辑包数据页面
  const openEditValidateQiTaoOutput = (row: any) => {
    editValidateQiTaoOutputTitle.value = '编辑包数据';
    editDialogRefValidateQiTaoOutput.value.openDialog(2,row);
  };

  // åˆ é™¤åŒ…数据
  const delValidateQiTaoOutput = (row: any) => {
    ElMessageBox.confirm(`确定要删除吗?`, "提示", {
    confirmButtonText: "确定",
    cancelButtonText: "取消",
    type: "warning",
  })
  .then(async () => {
    loadingValidateQiTaoOutput.value = true;
    var ret = await deleteValidateQiTaoOutput(row);
    if(ret.data.type=="success"){
        ElMessage.success("删除成功");
    }
    loadingValidateQiTaoOutput.value = false;
    handleQueryValidateQiTaoOutput();
  })
  .catch(() => {});
  };

  // æ”¹å˜åŒ…数据页面容量
  const handleSizeChangeValidateQiTaoOutput = (val: number) => {
    tableParamsValidateQiTaoOutput.value.pageSize = val;
    handleQueryValidateQiTaoOutput();
  };

  // æ”¹å˜åŒ…数据页码序号
  const handleCurrentChangeValidateQiTaoOutput = (val: number) => {
    tableParamsValidateQiTaoOutput.value.page = val;
    handleQueryValidateQiTaoOutput();
  };

/***************************************************[包数据操作]结束***************************************************/
/***************************************************[包数据导出]开始***************************************************/
//定义当前页面的方法组
const functionMapValidateQiTaoOutput = {
      getEnumAreaCodeData_Index,
      getEnumUpiStatusData_Index,
      formatDate_T_Date,
      formatDate_T_Time
};
//点击导出按钮
const handleExportExcelValidateQiTaoOutput = async (formData:Blob) => {
    loadingValidateQiTaoOutput.value = true;
    disabled_btnValidateQiTaoOutput.value = true;
    var new_tableParamsValidateQiTaoOutput=JSON.parse(JSON.stringify(tableParamsValidateQiTaoOutput.value));
    new_tableParamsValidateQiTaoOutput.page = 1;
    new_tableParamsValidateQiTaoOutput.pageSize = 100000;
    var res = await pageValidateQiTaoOutput(Object.assign(queryParamsValidateQiTaoOutput.value, new_tableParamsValidateQiTaoOutput));
    if(res.data.type=="success"){
      exportExcelValidateQiTaoOutput(res.data.result?.items ?? []);
    }
    loadingValidateQiTaoOutput.value = false;
    disabled_btnValidateQiTaoOutput.value = false;
};
//导出
const exportExcelValidateQiTaoOutput  = async (exportDataList:Array) => {
  exportPageExcel(exportDataList, tableRefValidateQiTaoOutput,"包数据",functionMapValidateQiTaoOutput);
};
/***************************************************[包数据导出]结束***************************************************/
  // åŒ…数据页面加载时
  onMounted(async () => {
    getEnumAreaCodeData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('AreaCodeEnum')).data.result ?? [];
    getEnumUpiStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiStatusEnum')).data.result ?? [];
  });

  handleQueryValidateQiTaoOutput();
</script>
<style scoped>
:deep(.el-input),
:deep(.el-select),
:deep(.el-input-number) {
    width: 100%;
}
</style>


 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json

@@ -9,7 +9,9 @@
        //"ConfigId": "1300000000001", // é»˜è®¤åº“标识-禁止修改
        "DbType": "SqlServer", // MySql、SqlServer、Sqlite、Oracle、PostgreSQL、Dm、Kdbndp、Oscar、MySqlConnector、Access、OpenGauss、QuestDB、HG、ClickHouse、GBase、Odbc、Custom
        // "ConnectionString": "Server=.;Database=iWare_RawMaterialWarehouse_Wms;User=sa;Password=123456;MultipleActiveResultSets=True;", // åº“连接字符串
        "ConnectionString": "Server=172.17.1.111;Database=LA24030_LuLiPackageLine;User=sa;Password=admin@123;MultipleActiveResultSets=True;", // åº“连接字符串
       // "ConnectionString": "Server=172.17.1.111;Database=LA24030_LuLiPackageLine;User=sa;Password=admin@123;MultipleActiveResultSets=True;", // åº“连接字符串
        "ConnectionString": "Server=.;Database=LA24030_LuLiPackageLine;User=sa;Password=123abc.com;MultipleActiveResultSets=True;", // åº“连接字符串

        //"SlaveConnectionConfigs": [ // è¯»å†™åˆ†ç¦»/主从
        //    {
        //        "HitRate": 10,

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

@@ -18,14 +18,7 @@
    [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "包装号", Length = 50)]
    public string PackageCode { get; set; }

    [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; }
   

    #endregion


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

@@ -15,6 +15,16 @@
    {

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

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

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

@@ -22,11 +32,7 @@
        [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】
@@ -44,17 +50,6 @@
        [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

@@ -99,12 +94,6 @@
        /// </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发货

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

@@ -13,6 +13,15 @@
    [SugarTable("mes_package_linequeue", "包产线队列数据")]
    public class Mes_Package_LineQueue : EntityBase
    {
        [Required]
        [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "包装号", Length = 50)]
        public string PackageCode { get; set; }

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

        [Required]
        [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "批次号", Length = 50)]
@@ -22,11 +31,7 @@
        [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】
@@ -47,16 +52,6 @@

        #endregion


        #region åŒ…装线有关

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



        #endregion



@@ -100,11 +95,6 @@
        [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发货

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

@@ -13,6 +13,15 @@
    [SugarTable("mes_package_unline_record", "包产线下线记录数据")]
    public class Mes_Package_UnLine_Record : EntityBase
    {
        [Required]
        [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "包装号", Length = 50)]
        public string PackageCode { get; set; }

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

        [Required]
        [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "批次号", Length = 50)]
@@ -22,23 +31,7 @@
        [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 åŒ…装线有关

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



        #endregion

    


        [SugarColumn(ColumnName = "Info1", ColumnDescription = "纸箱长", Length = 50)]
@@ -81,11 +74,6 @@
        [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发货

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Dto/Mes_Package_UnLine_RecordInput.cs

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

namespace Admin.NET.Application;

    /// <summary>
    /// åŒ…下线记录基础输入参数
    /// </summary>
    public class Mes_Package_UnLine_RecordBaseInput
    {
        /// <summary>
        /// åŒ…装号
        /// </summary>
        public virtual string PackageCode { get; set; }
        
        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        public virtual string Info5 { get; set; }
        
        /// <summary>
        /// æ‰¹æ¬¡å·
        /// </summary>
        public virtual string PlanNo { get; set; }
        
        /// <summary>
        /// è®¢å•å·
        /// </summary>
        public virtual string OrderId { get; set; }
        
        /// <summary>
        /// çº¸ç®±é•¿
        /// </summary>
        public virtual float? Info1 { get; set; }
        
        /// <summary>
        /// çº¸ç®±å®½
        /// </summary>
        public virtual float? Info2 { get; set; }
        
        /// <summary>
        /// çº¸ç®±é«˜
        /// </summary>
        public virtual float? Info3 { get; set; }
        
        /// <summary>
        /// é”€å”®åˆåŒå•å·
        /// </summary>
        public virtual string Info4 { get; set; }
        
        /// <summary>
        /// ç¬¬å‡ åŒ…
        /// </summary>
        public virtual string Info6 { get; set; }
        
        /// <summary>
        /// ç»é”€åº—名称
        /// </summary>
        public virtual string Info7 { get; set; }
        
        /// <summary>
        /// äº§å“åç§°
        /// </summary>
        public virtual string Info8 { get; set; }
        
        /// <summary>
        /// å®¢æˆ·åç§°
        /// </summary>
        public virtual string Info10 { get; set; }
        
        /// <summary>
        /// è‡ªæor发货
        /// </summary>
        public virtual string Info11 { get; set; }
        
        /// <summary>
        /// åŒ…装部件总数量
        /// </summary>
        public virtual string Info12 { get; set; }
        
        /// <summary>
        /// åŒ…装面积
        /// </summary>
        public virtual string Info13 { get; set; }
        
        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public virtual string OpRemark { get; set; }
        
        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        public virtual DateTime? CreateTime { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹æ—¶é—´
        /// </summary>
        public virtual DateTime? UpdateTime { get; set; }
        
        /// <summary>
        /// åˆ›å»ºäººId
        /// </summary>
        public virtual long? CreateUserId { get; set; }
        
        /// <summary>
        /// åˆ›å»ºäºº
        /// </summary>
        public virtual string CreateUserName { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹äººId
        /// </summary>
        public virtual long? UpdateUserId { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹äºº
        /// </summary>
        public virtual string UpdateUserName { get; set; }
        
        /// <summary>
        /// è½¯åˆ é™¤
        /// </summary>
        public virtual bool IsDelete { get; set; }
        
    }

    /// <summary>
    /// åŒ…下线记录分页查询输入参数
    /// </summary>
    public class Mes_Package_UnLine_RecordInput : BasePageInput
    {
        /// <summary>
        /// å…³é”®å­—查询
        /// </summary>
        public string? SearchKey { get; set; }

        /// <summary>
        /// åŒ…装号
        /// </summary>
        public string? PackageCode { get; set; }
        
        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        public string? Info5 { get; set; }
        
        /// <summary>
        /// æ‰¹æ¬¡å·
        /// </summary>
        public string? PlanNo { get; set; }
        
        /// <summary>
        /// è®¢å•å·
        /// </summary>
        public string? OrderId { get; set; }
        
        /// <summary>
        /// çº¸ç®±é•¿
        /// </summary>
        public float? Info1 { get; set; }
        
        /// <summary>
        /// çº¸ç®±å®½
        /// </summary>
        public float? Info2 { get; set; }
        
        /// <summary>
        /// çº¸ç®±é«˜
        /// </summary>
        public float? Info3 { get; set; }
        
        /// <summary>
        /// é”€å”®åˆåŒå•å·
        /// </summary>
        public string? Info4 { get; set; }
        
        /// <summary>
        /// ç¬¬å‡ åŒ…
        /// </summary>
        public string? Info6 { get; set; }
        
        /// <summary>
        /// ç»é”€åº—名称
        /// </summary>
        public string? Info7 { get; set; }
        
        /// <summary>
        /// äº§å“åç§°
        /// </summary>
        public string? Info8 { get; set; }
        
        /// <summary>
        /// å®¢æˆ·åç§°
        /// </summary>
        public string? Info10 { get; set; }
        
        /// <summary>
        /// è‡ªæor发货
        /// </summary>
        public string? Info11 { get; set; }
        
        /// <summary>
        /// åŒ…装部件总数量
        /// </summary>
        public string? Info12 { get; set; }
        
        /// <summary>
        /// åŒ…装面积
        /// </summary>
        public string? Info13 { get; set; }
        
        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public string? OpRemark { get; set; }
        
    }

    /// <summary>
    /// åŒ…下线记录增加输入参数
    /// </summary>
    public class AddMes_Package_UnLine_RecordInput : Mes_Package_UnLine_RecordBaseInput
    {
        /// <summary>
        /// åŒ…装号
        /// </summary>
        [Required(ErrorMessage = "包装号不能为空")]
        public override string PackageCode { get; set; }
        
        /// <summary>
        /// æ‰¹æ¬¡å·
        /// </summary>
        [Required(ErrorMessage = "批次号不能为空")]
        public override string PlanNo { get; set; }
        
        /// <summary>
        /// è®¢å•å·
        /// </summary>
        [Required(ErrorMessage = "订单号不能为空")]
        public override string OrderId { get; set; }
        
        /// <summary>
        /// è½¯åˆ é™¤
        /// </summary>
        [Required(ErrorMessage = "软删除不能为空")]
        public override bool IsDelete { get; set; }
        
    }

    /// <summary>
    /// åŒ…下线记录删除输入参数
    /// </summary>
    public class DeleteMes_Package_UnLine_RecordInput : BaseIdInput
    {
    }

    /// <summary>
    /// åŒ…下线记录更新输入参数
    /// </summary>
    public class UpdateMes_Package_UnLine_RecordInput : AddMes_Package_UnLine_RecordInput
    {
        /// <summary>
        /// ä¸»é”®Id
        /// </summary>
        [Required(ErrorMessage = "主键Id不能为空")]
        public long Id { get; set; }
        
    }

    /// <summary>
    /// åŒ…下线记录主键查询输入参数
    /// </summary>
    public class QueryByIdMes_Package_UnLine_RecordInput : DeleteMes_Package_UnLine_RecordInput
    {

    }

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Dto/Mes_Package_UnLine_RecordOutput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,130 @@
namespace Admin.NET.Application;

/// <summary>
/// åŒ…下线记录输出参数
/// </summary>
public class Mes_Package_UnLine_RecordOutput
{
    /// <summary>
    /// ä¸»é”®Id
    /// </summary>
    public long? Id { get; set; }
    
    /// <summary>
    /// åŒ…装号
    /// </summary>
    public string PackageCode { get; set; }
    
    /// <summary>
    /// ç”Ÿäº§å•å·
    /// </summary>
    public string Info5 { get; set; }
    
    /// <summary>
    /// æ‰¹æ¬¡å·
    /// </summary>
    public string PlanNo { get; set; }
    
    /// <summary>
    /// è®¢å•å·
    /// </summary>
    public string OrderId { get; set; }
    
    /// <summary>
    /// çº¸ç®±é•¿
    /// </summary>
    public float? Info1 { get; set; }
    
    /// <summary>
    /// çº¸ç®±å®½
    /// </summary>
    public float? Info2 { get; set; }
    
    /// <summary>
    /// çº¸ç®±é«˜
    /// </summary>
    public float? Info3 { get; set; }
    
    /// <summary>
    /// é”€å”®åˆåŒå•å·
    /// </summary>
    public string Info4 { get; set; }
    
    /// <summary>
    /// ç¬¬å‡ åŒ…
    /// </summary>
    public string Info6 { get; set; }
    
    /// <summary>
    /// ç»é”€åº—名称
    /// </summary>
    public string Info7 { get; set; }
    
    /// <summary>
    /// äº§å“åç§°
    /// </summary>
    public string Info8 { get; set; }
    
    /// <summary>
    /// å®¢æˆ·åç§°
    /// </summary>
    public string Info10 { get; set; }
    
    /// <summary>
    /// è‡ªæor发货
    /// </summary>
    public string Info11 { get; set; }
    
    /// <summary>
    /// åŒ…装部件总数量
    /// </summary>
    public string Info12 { get; set; }
    
    /// <summary>
    /// åŒ…装面积
    /// </summary>
    public string Info13 { get; set; }
    
    /// <summary>
    /// å¤‡æ³¨
    /// </summary>
    public string OpRemark { get; set; }
    
    /// <summary>
    /// åˆ›å»ºæ—¶é—´
    /// </summary>
    public DateTime? CreateTime { get; set; }
    
    /// <summary>
    /// ä¿®æ”¹æ—¶é—´
    /// </summary>
    public DateTime? UpdateTime { get; set; }
    
    /// <summary>
    /// åˆ›å»ºäººId
    /// </summary>
    public long? CreateUserId { get; set; }
    
    /// <summary>
    /// åˆ›å»ºäºº
    /// </summary>
    public string CreateUserName { get; set; }
    
    /// <summary>
    /// ä¿®æ”¹äººId
    /// </summary>
    public long? UpdateUserId { get; set; }
    
    /// <summary>
    /// ä¿®æ”¹äºº
    /// </summary>
    public string UpdateUserName { get; set; }
    
    /// <summary>
    /// è½¯åˆ é™¤
    /// </summary>
    public bool IsDelete { get; set; }
    
    }
 


 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Mes_Package_UnLine_RecordService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,207 @@
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.ReportCenterGroupName, Order = 100)]
public class Mes_Package_UnLine_RecordService : IDynamicApiController, ITransient
{
    private readonly SqlSugarRepository<Mes_Package_UnLine_Record> _rep;
    public Mes_Package_UnLine_RecordService(SqlSugarRepository<Mes_Package_UnLine_Record> rep)
    {
        _rep = rep;
    }

    /// <summary>
    /// åˆ†é¡µæŸ¥è¯¢åŒ…下线记录
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Page")]
    [Description("Mes_Package_UnLine_Record/Page")]
    public async Task<SqlSugarPagedList<Mes_Package_UnLine_RecordOutput>> Page(Mes_Package_UnLine_RecordInput input)
    {
        var query = CommonPageFilter(input);
        return await query.OrderBuilder(input, "", "Id").ToPagedListAsync(input.Page, input.PageSize);
    }

    /// <summary>
    /// ä¸åˆ†é¡µæŸ¥è¯¢åŒ…下线记录
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpGet]
    [ApiDescriptionSettings(Name = "List")]
    [Description("Mes_Package_UnLine_Record/List")]
    public async Task<List<Mes_Package_UnLine_RecordOutput>> List([FromQuery] Mes_Package_UnLine_RecordInput input)
    {
        var query = CommonPageFilter(input);
        return await query.OrderBuilder(input, "", "Id").Select<Mes_Package_UnLine_RecordOutput>().ToListAsync();
    }

    /// <summary>
    /// å¢žåŠ åŒ…下线记录
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Add")]
    [Description("Mes_Package_UnLine_Record/Add")]
    public async Task<long> Add(AddMes_Package_UnLine_RecordInput input)
    {
        var entity = input.Adapt<Mes_Package_UnLine_Record>();

        //重复性验证
        await CheckExist(entity);

        await _rep.InsertAsync(entity);
        return entity.Id;
    }

    /// <summary>
    /// åˆ é™¤åŒ…下线记录
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Delete")]
    [Description("Mes_Package_UnLine_Record/Delete")]
    public async Task Delete(DeleteMes_Package_UnLine_RecordInput input)
    {
        var entity = await _rep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
        //await _rep.FakeDeleteAsync(entity);   //假删除
        await _rep.DeleteAsync(entity);   //真删除
    }

    /// <summary>
    /// æ›´æ–°åŒ…下线记录
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Update")]
    [Description("Mes_Package_UnLine_Record/Update")]
    public async Task Update(UpdateMes_Package_UnLine_RecordInput input)
    {
        var entity = input.Adapt<Mes_Package_UnLine_Record>();

        //重复性验证
        await CheckExist(entity,true);

        await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
    }

    /// <summary>
    /// èŽ·å–包下线记录
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpGet]
    [ApiDescriptionSettings(Name = "Detail")]
    [Description("Mes_Package_UnLine_Record/Detail")]
    public async Task<Mes_Package_UnLine_Record> Detail([FromQuery] QueryByIdMes_Package_UnLine_RecordInput input)
    {
        return await _rep.GetFirstAsync(u => u.Id == input.Id);
    }






    #region ç§æœ‰æ–¹æ³•

    /// <summary>
    /// å…¬å…±æŸ¥è¯¢åŒ…下线记录条件
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    private ISugarQueryable<Mes_Package_UnLine_RecordOutput> CommonPageFilter(Mes_Package_UnLine_RecordInput input)
    {
        var query = _rep.AsQueryable()
            .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
                u.PackageCode.Contains(input.SearchKey.Trim())
                || u.Info5.Contains(input.SearchKey.Trim())
                || u.PlanNo.Contains(input.SearchKey.Trim())
                || u.OrderId.Contains(input.SearchKey.Trim())
                || u.Info4.Contains(input.SearchKey.Trim())
                || u.Info6.Contains(input.SearchKey.Trim())
                || u.Info7.Contains(input.SearchKey.Trim())
                || u.Info8.Contains(input.SearchKey.Trim())
                || u.Info10.Contains(input.SearchKey.Trim())
                || u.Info11.Contains(input.SearchKey.Trim())
                || u.Info12.Contains(input.SearchKey.Trim())
                || u.Info13.Contains(input.SearchKey.Trim())
                || u.OpRemark.Contains(input.SearchKey.Trim())
                || u.CreateUserName.Contains(input.SearchKey.Trim())
                || u.UpdateUserName.Contains(input.SearchKey.Trim())
            )
            .WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.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.Info4), u => u.Info4.Contains(input.Info4.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info6), u => u.Info6.Contains(input.Info6.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info7), u => u.Info7.Contains(input.Info7.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info8), u => u.Info8.Contains(input.Info8.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info10), u => u.Info10.Contains(input.Info10.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info11), u => u.Info11.Contains(input.Info11.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info12), u => u.Info12.Contains(input.Info12.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info13), u => u.Info13.Contains(input.Info13.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.OpRemark), u => u.OpRemark.Contains(input.OpRemark.Trim()))
            .Select<Mes_Package_UnLine_RecordOutput>();
        return query;
       }

        /// <summary>
        /// é‡å¤æ€§éªŒè¯
        /// </summary>
        /// <param name="input">验证对象</param>
        /// <param name="isEdit">是否是编辑</param>
        /// <returns></returns>
        private async Task CheckExist( Mes_Package_UnLine_Record input,bool isEdit=false)
        {
           


            //没有配置组合校验，不需要验重

           
            //没有配置单独校验，不需要验重
       }

       /// <summary>
        /// æ ¹æ®ç»„合校验和单独校验验证数据是否已存在-导入时验证
        /// </summary>
        /// <param name="inputs"></param>
        /// <returns></returns>
        private async Task CheckExisitForImport(List<Mes_Package_UnLine_Record> inputs)
        { 
            if (inputs?.Count <= 0)
            {
                throw Oops.Oh($"导入数据不能为空");
            }
            //根据组合校验验证表格中中是否已存在相同数据  
                      






          
           //根据单独校验验证表格中中是否已存在相同数据  
           
           
           
        }
     #endregion

}


 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/Dto/MesPushPaperCutInput.cs

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

namespace Admin.NET.Application;

    /// <summary>
    /// çº¸ç®±æœºå¯¹æŽ¥åŸºç¡€è¾“入参数
    /// </summary>
    public class MesPushPaperCutBaseInput
    {
        /// <summary>
        /// åŒ…装号
        /// </summary>
        public virtual string PackageCode { get; set; }
        
        /// <summary>
        /// æŽ¨é€çŠ¶æ€
        /// </summary>
        public virtual Admin.NET.Core.Enum.PushStatusEnum PushStatus { get; set; }
        
        /// <summary>
        /// æŽ¨é€æ—¶é—´
        /// </summary>
        public virtual DateTime? PushTime { get; set; }
        
        /// <summary>
        /// æŽ¨é€æ¬¡æ•°
        /// </summary>
        public virtual int PushNum { get; set; }
        
        /// <summary>
        /// æŽ¥å£è¿”回参数
        /// </summary>
        public virtual string ApiMessage { get; set; }
        
        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        public virtual DateTime? CreateTime { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹æ—¶é—´
        /// </summary>
        public virtual DateTime? UpdateTime { get; set; }
        
        /// <summary>
        /// åˆ›å»ºäººId
        /// </summary>
        public virtual long? CreateUserId { get; set; }
        
        /// <summary>
        /// åˆ›å»ºäºº
        /// </summary>
        public virtual string CreateUserName { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹äººId
        /// </summary>
        public virtual long? UpdateUserId { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹äºº
        /// </summary>
        public virtual string UpdateUserName { get; set; }
        
        /// <summary>
        /// è½¯åˆ é™¤
        /// </summary>
        public virtual bool IsDelete { get; set; }
        
    }

    /// <summary>
    /// çº¸ç®±æœºå¯¹æŽ¥åˆ†é¡µæŸ¥è¯¢è¾“入参数
    /// </summary>
    public class MesPushPaperCutInput : BasePageInput
    {
        /// <summary>
        /// å…³é”®å­—查询
        /// </summary>
        public string? SearchKey { get; set; }

        /// <summary>
        /// åŒ…装号
        /// </summary>
        public string? PackageCode { get; set; }
        
        /// <summary>
        /// æŽ¨é€çŠ¶æ€
        /// </summary>
        public Admin.NET.Core.Enum.PushStatusEnum? PushStatus { get; set; }
        
        /// <summary>
        /// æŽ¨é€æ—¶é—´
        /// </summary>
        public DateTime? PushTime { get; set; }
        
        /// <summary>
         /// æŽ¨é€æ—¶é—´èŒƒå›´
         /// </summary>
         public List<DateTime?> PushTimeRange { get; set; } 
        /// <summary>
        /// æŽ¨é€æ¬¡æ•°
        /// </summary>
        public int? PushNum { get; set; }
        
        /// <summary>
        /// æŽ¥å£è¿”回参数
        /// </summary>
        public string? ApiMessage { get; set; }
        
    }

    /// <summary>
    /// çº¸ç®±æœºå¯¹æŽ¥å¢žåŠ è¾“入参数
    /// </summary>
    public class AddMesPushPaperCutInput : MesPushPaperCutBaseInput
    {
        /// <summary>
        /// åŒ…装号
        /// </summary>
        [Required(ErrorMessage = "包装号不能为空")]
        public override string PackageCode { get; set; }
        
        /// <summary>
        /// æŽ¨é€çŠ¶æ€
        /// </summary>
        [Required(ErrorMessage = "推送状态不能为空")]
        public override Admin.NET.Core.Enum.PushStatusEnum PushStatus { get; set; }
        
        /// <summary>
        /// æŽ¨é€æ¬¡æ•°
        /// </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 bool IsDelete { get; set; }
        
    }

    /// <summary>
    /// çº¸ç®±æœºå¯¹æŽ¥åˆ é™¤è¾“入参数
    /// </summary>
    public class DeleteMesPushPaperCutInput : BaseIdInput
    {
    }

    /// <summary>
    /// çº¸ç®±æœºå¯¹æŽ¥æ›´æ–°è¾“入参数
    /// </summary>
    public class UpdateMesPushPaperCutInput : AddMesPushPaperCutInput
    {
        /// <summary>
        /// ä¸»é”®Id
        /// </summary>
        [Required(ErrorMessage = "主键Id不能为空")]
        public long Id { get; set; }
        
    }

    /// <summary>
    /// çº¸ç®±æœºå¯¹æŽ¥ä¸»é”®æŸ¥è¯¢è¾“入参数
    /// </summary>
    public class QueryByIdMesPushPaperCutInput : DeleteMesPushPaperCutInput
    {

    }

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/Dto/MesPushPaperCutOutput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,75 @@
namespace Admin.NET.Application;

/// <summary>
/// çº¸ç®±æœºå¯¹æŽ¥è¾“出参数
/// </summary>
public class MesPushPaperCutOutput
{
    /// <summary>
    /// ä¸»é”®Id
    /// </summary>
    public long? Id { get; set; }
    
    /// <summary>
    /// åŒ…装号
    /// </summary>
    public string PackageCode { get; set; }
    
    /// <summary>
    /// æŽ¨é€çŠ¶æ€
    /// </summary>
    public Admin.NET.Core.Enum.PushStatusEnum PushStatus { get; set; }
    
    /// <summary>
    /// æŽ¨é€æ—¶é—´
    /// </summary>
    public DateTime? PushTime { get; set; }
    
    /// <summary>
    /// æŽ¨é€æ¬¡æ•°
    /// </summary>
    public int PushNum { get; set; }
    
    /// <summary>
    /// æŽ¥å£è¿”回参数
    /// </summary>
    public string ApiMessage { get; set; }
    
    /// <summary>
    /// åˆ›å»ºæ—¶é—´
    /// </summary>
    public DateTime? CreateTime { get; set; }
    
    /// <summary>
    /// ä¿®æ”¹æ—¶é—´
    /// </summary>
    public DateTime? UpdateTime { get; set; }
    
    /// <summary>
    /// åˆ›å»ºäººId
    /// </summary>
    public long? CreateUserId { get; set; }
    
    /// <summary>
    /// åˆ›å»ºäºº
    /// </summary>
    public string CreateUserName { get; set; }
    
    /// <summary>
    /// ä¿®æ”¹äººId
    /// </summary>
    public long? UpdateUserId { get; set; }
    
    /// <summary>
    /// ä¿®æ”¹äºº
    /// </summary>
    public string UpdateUserName { get; set; }
    
    /// <summary>
    /// è½¯åˆ é™¤
    /// </summary>
    public bool IsDelete { get; set; }
    
    }
 


 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/MesPushPaperCutService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,197 @@
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.ThirdInterFaceGroupName, Order = 100)]
public class MesPushPaperCutService : IDynamicApiController, ITransient
{
    private readonly SqlSugarRepository<MesPushPaperCut> _rep;
    public MesPushPaperCutService(SqlSugarRepository<MesPushPaperCut> rep)
    {
        _rep = rep;
    }

    /// <summary>
    /// åˆ†é¡µæŸ¥è¯¢çº¸ç®±æœºå¯¹æŽ¥
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Page")]
    [Description("MesPushPaperCut/Page")]
    public async Task<SqlSugarPagedList<MesPushPaperCutOutput>> Page(MesPushPaperCutInput input)
    {
        var query = CommonPageFilter(input);
        return await query.OrderBuilder(input, "", "Id").ToPagedListAsync(input.Page, input.PageSize);
    }

    /// <summary>
    /// ä¸åˆ†é¡µæŸ¥è¯¢çº¸ç®±æœºå¯¹æŽ¥
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpGet]
    [ApiDescriptionSettings(Name = "List")]
    [Description("MesPushPaperCut/List")]
    public async Task<List<MesPushPaperCutOutput>> List([FromQuery] MesPushPaperCutInput input)
    {
        var query = CommonPageFilter(input);
        return await query.OrderBuilder(input, "", "Id").Select<MesPushPaperCutOutput>().ToListAsync();
    }

    /// <summary>
    /// å¢žåŠ çº¸ç®±æœºå¯¹æŽ¥
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Add")]
    [Description("MesPushPaperCut/Add")]
    public async Task<long> Add(AddMesPushPaperCutInput input)
    {
        var entity = input.Adapt<MesPushPaperCut>();

        //重复性验证
        await CheckExist(entity);

        await _rep.InsertAsync(entity);
        return entity.Id;
    }

    /// <summary>
    /// åˆ é™¤çº¸ç®±æœºå¯¹æŽ¥
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Delete")]
    [Description("MesPushPaperCut/Delete")]
    public async Task Delete(DeleteMesPushPaperCutInput input)
    {
        var entity = await _rep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
        //await _rep.FakeDeleteAsync(entity);   //假删除
        await _rep.DeleteAsync(entity);   //真删除
    }

    /// <summary>
    /// æ›´æ–°çº¸ç®±æœºå¯¹æŽ¥
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Update")]
    [Description("MesPushPaperCut/Update")]
    public async Task Update(UpdateMesPushPaperCutInput input)
    {
        var entity = input.Adapt<MesPushPaperCut>();

        //重复性验证
        await CheckExist(entity,true);

        await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
    }

    /// <summary>
    /// èŽ·å–纸箱机对接
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpGet]
    [ApiDescriptionSettings(Name = "Detail")]
    [Description("MesPushPaperCut/Detail")]
    public async Task<MesPushPaperCut> Detail([FromQuery] QueryByIdMesPushPaperCutInput input)
    {
        return await _rep.GetFirstAsync(u => u.Id == input.Id);
    }






    #region ç§æœ‰æ–¹æ³•

    /// <summary>
    /// å…¬å…±æŸ¥è¯¢çº¸ç®±æœºå¯¹æŽ¥æ¡ä»¶
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    private ISugarQueryable<MesPushPaperCutOutput> CommonPageFilter(MesPushPaperCutInput input)
    {
        var query = _rep.AsQueryable()
            .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
                u.PackageCode.Contains(input.SearchKey.Trim())
                || u.ApiMessage.Contains(input.SearchKey.Trim())
                || u.CreateUserName.Contains(input.SearchKey.Trim())
                || u.UpdateUserName.Contains(input.SearchKey.Trim())
            )
            .WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
            .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()))
            .Select<MesPushPaperCutOutput>();
        if(input.PushTimeRange != null && input.PushTimeRange.Count >0)
        {
            DateTime? start= input.PushTimeRange[0].Value.AddDays(-1);
            query = query.WhereIF(start.HasValue, u => u.PushTime > start);
            if (input.PushTimeRange.Count >1 && input.PushTimeRange[1].HasValue)
            {
                var end = input.PushTimeRange[1].Value.AddDays(1);
                query = query.Where(u => u.PushTime < end);
            }
        } 
        return query;
       }

        /// <summary>
        /// é‡å¤æ€§éªŒè¯
        /// </summary>
        /// <param name="input">验证对象</param>
        /// <param name="isEdit">是否是编辑</param>
        /// <returns></returns>
        private async Task CheckExist( MesPushPaperCut input,bool isEdit=false)
        {
           


            //没有配置组合校验，不需要验重

           
            //没有配置单独校验，不需要验重
       }

       /// <summary>
        /// æ ¹æ®ç»„合校验和单独校验验证数据是否已存在-导入时验证
        /// </summary>
        /// <param name="inputs"></param>
        /// <returns></returns>
        private async Task CheckExisitForImport(List<MesPushPaperCut> inputs)
        { 
            if (inputs?.Count <= 0)
            {
                throw Oops.Oh($"导入数据不能为空");
            }
            //根据组合校验验证表格中中是否已存在相同数据  
                      






          
           //根据单独校验验证表格中中是否已存在相同数据  
           
           
           
        }
     #endregion

}


 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Dto/Mes_Package_GatherInput.cs

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

namespace Admin.NET.Application;

    /// <summary>
    /// åŒ…数据基础输入参数
    /// </summary>
    public class Mes_Package_GatherBaseInput
    {
        /// <summary>
        /// åŒ…装号
        /// </summary>
        public virtual string PackageCode { get; set; }
        
        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        public virtual string Info5 { get; set; }
        
        /// <summary>
        /// æ‰¹æ¬¡å·
        /// </summary>
        public virtual string PlanNo { get; set; }
        
        /// <summary>
        /// è®¢å•å·
        /// </summary>
        public virtual string OrderId { get; set; }
        
        /// <summary>
        /// æ‰€åœ¨åŒºåŸŸ
        /// </summary>
        public virtual Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
        
        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        public virtual Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
        
        /// <summary>
        /// çº¸ç®±é•¿
        /// </summary>
        public virtual float? Info1 { get; set; }
        
        /// <summary>
        /// çº¸ç®±å®½
        /// </summary>
        public virtual float? Info2 { get; set; }
        
        /// <summary>
        /// çº¸ç®±é«˜
        /// </summary>
        public virtual float? Info3 { get; set; }
        
        /// <summary>
        /// é”€å”®åˆåŒå•å·
        /// </summary>
        public virtual string Info4 { get; set; }
        
        /// <summary>
        /// ç¬¬å‡ åŒ…
        /// </summary>
        public virtual string Info6 { get; set; }
        
        /// <summary>
        /// ç»é”€åº—名称
        /// </summary>
        public virtual string Info7 { get; set; }
        
        /// <summary>
        /// äº§å“åç§°
        /// </summary>
        public virtual string Info8 { get; set; }
        
        /// <summary>
        /// å®¢æˆ·åç§°
        /// </summary>
        public virtual string Info10 { get; set; }
        
        /// <summary>
        /// è‡ªæor发货
        /// </summary>
        public virtual string Info11 { get; set; }
        
        /// <summary>
        /// åŒ…装部件总数量
        /// </summary>
        public virtual string Info12 { get; set; }
        
        /// <summary>
        /// åŒ…装面积
        /// </summary>
        public virtual string Info13 { get; set; }
        
        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        public virtual DateTime? CreateTime { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹æ—¶é—´
        /// </summary>
        public virtual DateTime? UpdateTime { get; set; }
        
        /// <summary>
        /// åˆ›å»ºäººId
        /// </summary>
        public virtual long? CreateUserId { get; set; }
        
        /// <summary>
        /// åˆ›å»ºäºº
        /// </summary>
        public virtual string CreateUserName { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹äººId
        /// </summary>
        public virtual long? UpdateUserId { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹äºº
        /// </summary>
        public virtual string UpdateUserName { get; set; }
        
        /// <summary>
        /// è½¯åˆ é™¤
        /// </summary>
        public virtual bool IsDelete { get; set; }
        
    }

    /// <summary>
    /// åŒ…数据分页查询输入参数
    /// </summary>
    public class Mes_Package_GatherInput : BasePageInput
    {
        /// <summary>
        /// å…³é”®å­—查询
        /// </summary>
        public string? SearchKey { get; set; }

        /// <summary>
        /// åŒ…装号
        /// </summary>
        public string? PackageCode { get; set; }
        
        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        public string? Info5 { get; set; }
        
        /// <summary>
        /// æ‰¹æ¬¡å·
        /// </summary>
        public string? PlanNo { get; set; }
        
        /// <summary>
        /// è®¢å•å·
        /// </summary>
        public string? OrderId { get; set; }
        
        /// <summary>
        /// æ‰€åœ¨åŒºåŸŸ
        /// </summary>
        public Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
        
        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        public Admin.NET.Application.UpiStatusEnum? UpiStatus { get; set; }
        
        /// <summary>
        /// çº¸ç®±é•¿
        /// </summary>
        public float? Info1 { get; set; }
        
        /// <summary>
        /// çº¸ç®±å®½
        /// </summary>
        public float? Info2 { get; set; }
        
        /// <summary>
        /// çº¸ç®±é«˜
        /// </summary>
        public float? Info3 { get; set; }
        
        /// <summary>
        /// é”€å”®åˆåŒå•å·
        /// </summary>
        public string? Info4 { get; set; }
        
        /// <summary>
        /// ç¬¬å‡ åŒ…
        /// </summary>
        public string? Info6 { get; set; }
        
        /// <summary>
        /// ç»é”€åº—名称
        /// </summary>
        public string? Info7 { get; set; }
        
        /// <summary>
        /// äº§å“åç§°
        /// </summary>
        public string? Info8 { get; set; }
        
        /// <summary>
        /// å®¢æˆ·åç§°
        /// </summary>
        public string? Info10 { get; set; }
        
        /// <summary>
        /// è‡ªæor发货
        /// </summary>
        public string? Info11 { get; set; }
        
        /// <summary>
        /// åŒ…装部件总数量
        /// </summary>
        public string? Info12 { get; set; }
        
        /// <summary>
        /// åŒ…装面积
        /// </summary>
        public string? Info13 { get; set; }
        
    }

    /// <summary>
    /// åŒ…数据增加输入参数
    /// </summary>
    public class AddMes_Package_GatherInput : Mes_Package_GatherBaseInput
    {
        /// <summary>
        /// åŒ…装号
        /// </summary>
        [Required(ErrorMessage = "包装号不能为空")]
        public override string PackageCode { get; set; }
        
        /// <summary>
        /// æ‰¹æ¬¡å·
        /// </summary>
        [Required(ErrorMessage = "批次号不能为空")]
        public override string PlanNo { get; set; }
        
        /// <summary>
        /// è®¢å•å·
        /// </summary>
        [Required(ErrorMessage = "订单号不能为空")]
        public override string OrderId { get; set; }
        
        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        [Required(ErrorMessage = "板料状态不能为空")]
        public override Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
        
        /// <summary>
        /// è½¯åˆ é™¤
        /// </summary>
        [Required(ErrorMessage = "软删除不能为空")]
        public override bool IsDelete { get; set; }
        
    }

    /// <summary>
    /// åŒ…数据删除输入参数
    /// </summary>
    public class DeleteMes_Package_GatherInput : BaseIdInput
    {
    }

    /// <summary>
    /// åŒ…数据更新输入参数
    /// </summary>
    public class UpdateMes_Package_GatherInput : AddMes_Package_GatherInput
    {
        /// <summary>
        /// ä¸»é”®Id
        /// </summary>
        [Required(ErrorMessage = "主键Id不能为空")]
        public long Id { get; set; }
        
    }

    /// <summary>
    /// åŒ…数据主键查询输入参数
    /// </summary>
    public class QueryByIdMes_Package_GatherInput : DeleteMes_Package_GatherInput
    {

    }

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Dto/Mes_Package_GatherOutput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,135 @@
namespace Admin.NET.Application;

/// <summary>
/// åŒ…数据输出参数
/// </summary>
public class Mes_Package_GatherOutput
{
    /// <summary>
    /// ä¸»é”®Id
    /// </summary>
    public long? Id { get; set; }
    
    /// <summary>
    /// åŒ…装号
    /// </summary>
    public string PackageCode { get; set; }
    
    /// <summary>
    /// ç”Ÿäº§å•å·
    /// </summary>
    public string Info5 { get; set; }
    
    /// <summary>
    /// æ‰¹æ¬¡å·
    /// </summary>
    public string PlanNo { get; set; }
    
    /// <summary>
    /// è®¢å•å·
    /// </summary>
    public string OrderId { get; set; }
    
    /// <summary>
    /// æ‰€åœ¨åŒºåŸŸ
    /// </summary>
    public Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
    
    /// <summary>
    /// æ¿æ–™çŠ¶æ€
    /// </summary>
    public Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
    
    /// <summary>
    /// çº¸ç®±é•¿
    /// </summary>
    public float? Info1 { get; set; }
    
    /// <summary>
    /// çº¸ç®±å®½
    /// </summary>
    public float? Info2 { get; set; }
    
    /// <summary>
    /// çº¸ç®±é«˜
    /// </summary>
    public float? Info3 { get; set; }
    
    /// <summary>
    /// é”€å”®åˆåŒå•å·
    /// </summary>
    public string Info4 { get; set; }
    
    /// <summary>
    /// ç¬¬å‡ åŒ…
    /// </summary>
    public string Info6 { get; set; }
    
    /// <summary>
    /// ç»é”€åº—名称
    /// </summary>
    public string Info7 { get; set; }
    
    /// <summary>
    /// äº§å“åç§°
    /// </summary>
    public string Info8 { get; set; }
    
    /// <summary>
    /// å®¢æˆ·åç§°
    /// </summary>
    public string Info10 { get; set; }
    
    /// <summary>
    /// è‡ªæor发货
    /// </summary>
    public string Info11 { get; set; }
    
    /// <summary>
    /// åŒ…装部件总数量
    /// </summary>
    public string Info12 { get; set; }
    
    /// <summary>
    /// åŒ…装面积
    /// </summary>
    public string Info13 { get; set; }
    
    /// <summary>
    /// åˆ›å»ºæ—¶é—´
    /// </summary>
    public DateTime? CreateTime { get; set; }
    
    /// <summary>
    /// ä¿®æ”¹æ—¶é—´
    /// </summary>
    public DateTime? UpdateTime { get; set; }
    
    /// <summary>
    /// åˆ›å»ºäººId
    /// </summary>
    public long? CreateUserId { get; set; }
    
    /// <summary>
    /// åˆ›å»ºäºº
    /// </summary>
    public string CreateUserName { get; set; }
    
    /// <summary>
    /// ä¿®æ”¹äººId
    /// </summary>
    public long? UpdateUserId { get; set; }
    
    /// <summary>
    /// ä¿®æ”¹äºº
    /// </summary>
    public string UpdateUserName { get; set; }
    
    /// <summary>
    /// è½¯åˆ é™¤
    /// </summary>
    public bool IsDelete { get; set; }
    
    }
 


 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Mes_Package_GatherService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,207 @@
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.WmsOrderGroupName, Order = 100)]
public class Mes_Package_GatherService : IDynamicApiController, ITransient
{
    private readonly SqlSugarRepository<Mes_Package_Gather> _rep;
    public Mes_Package_GatherService(SqlSugarRepository<Mes_Package_Gather> rep)
    {
        _rep = rep;
    }

    /// <summary>
    /// åˆ†é¡µæŸ¥è¯¢åŒ…数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Page")]
    [Description("Mes_Package_Gather/Page")]
    public async Task<SqlSugarPagedList<Mes_Package_GatherOutput>> Page(Mes_Package_GatherInput input)
    {
        var query = CommonPageFilter(input);
        return await query.OrderBuilder(input, "", "Id").ToPagedListAsync(input.Page, input.PageSize);
    }

    /// <summary>
    /// ä¸åˆ†é¡µæŸ¥è¯¢åŒ…数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpGet]
    [ApiDescriptionSettings(Name = "List")]
    [Description("Mes_Package_Gather/List")]
    public async Task<List<Mes_Package_GatherOutput>> List([FromQuery] Mes_Package_GatherInput input)
    {
        var query = CommonPageFilter(input);
        return await query.OrderBuilder(input, "", "Id").Select<Mes_Package_GatherOutput>().ToListAsync();
    }

    /// <summary>
    /// å¢žåŠ åŒ…数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Add")]
    [Description("Mes_Package_Gather/Add")]
    public async Task<long> Add(AddMes_Package_GatherInput input)
    {
        var entity = input.Adapt<Mes_Package_Gather>();

        //重复性验证
        await CheckExist(entity);

        await _rep.InsertAsync(entity);
        return entity.Id;
    }

    /// <summary>
    /// åˆ é™¤åŒ…数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Delete")]
    [Description("Mes_Package_Gather/Delete")]
    public async Task Delete(DeleteMes_Package_GatherInput input)
    {
        var entity = await _rep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
        //await _rep.FakeDeleteAsync(entity);   //假删除
        await _rep.DeleteAsync(entity);   //真删除
    }

    /// <summary>
    /// æ›´æ–°åŒ…数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Update")]
    [Description("Mes_Package_Gather/Update")]
    public async Task Update(UpdateMes_Package_GatherInput input)
    {
        var entity = input.Adapt<Mes_Package_Gather>();

        //重复性验证
        await CheckExist(entity,true);

        await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
    }

    /// <summary>
    /// èŽ·å–包数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpGet]
    [ApiDescriptionSettings(Name = "Detail")]
    [Description("Mes_Package_Gather/Detail")]
    public async Task<Mes_Package_Gather> Detail([FromQuery] QueryByIdMes_Package_GatherInput input)
    {
        return await _rep.GetFirstAsync(u => u.Id == input.Id);
    }






    #region ç§æœ‰æ–¹æ³•

    /// <summary>
    /// å…¬å…±æŸ¥è¯¢åŒ…数据条件
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    private ISugarQueryable<Mes_Package_GatherOutput> CommonPageFilter(Mes_Package_GatherInput input)
    {
        var query = _rep.AsQueryable()
            .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
                u.PackageCode.Contains(input.SearchKey.Trim())
                || u.Info5.Contains(input.SearchKey.Trim())
                || u.PlanNo.Contains(input.SearchKey.Trim())
                || u.OrderId.Contains(input.SearchKey.Trim())
                || u.Info4.Contains(input.SearchKey.Trim())
                || u.Info6.Contains(input.SearchKey.Trim())
                || u.Info7.Contains(input.SearchKey.Trim())
                || u.Info8.Contains(input.SearchKey.Trim())
                || u.Info10.Contains(input.SearchKey.Trim())
                || u.Info11.Contains(input.SearchKey.Trim())
                || u.Info12.Contains(input.SearchKey.Trim())
                || u.Info13.Contains(input.SearchKey.Trim())
                || u.CreateUserName.Contains(input.SearchKey.Trim())
                || u.UpdateUserName.Contains(input.SearchKey.Trim())
            )
            .WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.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(input.AreaCode.HasValue, u => u.AreaCode == input.AreaCode)
            .WhereIF(input.UpiStatus.HasValue, u => u.UpiStatus == input.UpiStatus)
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info4), u => u.Info4.Contains(input.Info4.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info6), u => u.Info6.Contains(input.Info6.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info7), u => u.Info7.Contains(input.Info7.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info8), u => u.Info8.Contains(input.Info8.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info10), u => u.Info10.Contains(input.Info10.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info11), u => u.Info11.Contains(input.Info11.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info12), u => u.Info12.Contains(input.Info12.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info13), u => u.Info13.Contains(input.Info13.Trim()))
            .Select<Mes_Package_GatherOutput>();
        return query;
       }

        /// <summary>
        /// é‡å¤æ€§éªŒè¯
        /// </summary>
        /// <param name="input">验证对象</param>
        /// <param name="isEdit">是否是编辑</param>
        /// <returns></returns>
        private async Task CheckExist( Mes_Package_Gather input,bool isEdit=false)
        {
           


            //没有配置组合校验，不需要验重

           
            //没有配置单独校验，不需要验重
       }

       /// <summary>
        /// æ ¹æ®ç»„合校验和单独校验验证数据是否已存在-导入时验证
        /// </summary>
        /// <param name="inputs"></param>
        /// <returns></returns>
        private async Task CheckExisitForImport(List<Mes_Package_Gather> inputs)
        { 
            if (inputs?.Count <= 0)
            {
                throw Oops.Oh($"导入数据不能为空");
            }
            //根据组合校验验证表格中中是否已存在相同数据  
                      






          
           //根据单独校验验证表格中中是否已存在相同数据  
           
           
           
        }
     #endregion

}


 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_LineQueue/Dto/Mes_Package_LineQueueInput.cs

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

namespace Admin.NET.Application;

    /// <summary>
    /// åŒ…队列数据基础输入参数
    /// </summary>
    public class Mes_Package_LineQueueBaseInput
    {
        /// <summary>
        /// åŒ…装号
        /// </summary>
        public virtual string PackageCode { get; set; }
        
        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        public virtual string Info5 { get; set; }
        
        /// <summary>
        /// æ‰¹æ¬¡å·
        /// </summary>
        public virtual string PlanNo { get; set; }
        
        /// <summary>
        /// è®¢å•å·
        /// </summary>
        public virtual string OrderId { get; set; }
        
        /// <summary>
        /// æ‰€åœ¨åŒºåŸŸ
        /// </summary>
        public virtual Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
        
        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        public virtual Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
        
        /// <summary>
        /// çº¸ç®±é•¿
        /// </summary>
        public virtual float? Info1 { get; set; }
        
        /// <summary>
        /// çº¸ç®±å®½
        /// </summary>
        public virtual float? Info2 { get; set; }
        
        /// <summary>
        /// çº¸ç®±é«˜
        /// </summary>
        public virtual float? Info3 { get; set; }
        
        /// <summary>
        /// é”€å”®åˆåŒå•å·
        /// </summary>
        public virtual string Info4 { get; set; }
        
        /// <summary>
        /// ç¬¬å‡ åŒ…
        /// </summary>
        public virtual string Info6 { get; set; }
        
        /// <summary>
        /// ç»é”€åº—名称
        /// </summary>
        public virtual string Info7 { get; set; }
        
        /// <summary>
        /// äº§å“åç§°
        /// </summary>
        public virtual string Info8 { get; set; }
        
        /// <summary>
        /// å®¢æˆ·åç§°
        /// </summary>
        public virtual string Info10 { get; set; }
        
        /// <summary>
        /// è‡ªæor发货
        /// </summary>
        public virtual string Info11 { get; set; }
        
        /// <summary>
        /// åŒ…装部件总数量
        /// </summary>
        public virtual string Info12 { get; set; }
        
        /// <summary>
        /// åŒ…装面积
        /// </summary>
        public virtual string Info13 { get; set; }
        
        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        public virtual DateTime? CreateTime { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹æ—¶é—´
        /// </summary>
        public virtual DateTime? UpdateTime { get; set; }
        
        /// <summary>
        /// åˆ›å»ºäººId
        /// </summary>
        public virtual long? CreateUserId { get; set; }
        
        /// <summary>
        /// åˆ›å»ºäºº
        /// </summary>
        public virtual string CreateUserName { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹äººId
        /// </summary>
        public virtual long? UpdateUserId { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹äºº
        /// </summary>
        public virtual string UpdateUserName { get; set; }
        
        /// <summary>
        /// è½¯åˆ é™¤
        /// </summary>
        public virtual bool IsDelete { get; set; }
        
    }

    /// <summary>
    /// åŒ…队列数据分页查询输入参数
    /// </summary>
    public class Mes_Package_LineQueueInput : BasePageInput
    {
        /// <summary>
        /// å…³é”®å­—查询
        /// </summary>
        public string? SearchKey { get; set; }

        /// <summary>
        /// åŒ…装号
        /// </summary>
        public string? PackageCode { get; set; }
        
        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        public string? Info5 { get; set; }
        
        /// <summary>
        /// æ‰¹æ¬¡å·
        /// </summary>
        public string? PlanNo { get; set; }
        
        /// <summary>
        /// è®¢å•å·
        /// </summary>
        public string? OrderId { get; set; }
        
        /// <summary>
        /// æ‰€åœ¨åŒºåŸŸ
        /// </summary>
        public Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
        
        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        public Admin.NET.Application.UpiStatusEnum? UpiStatus { get; set; }
        
        /// <summary>
        /// çº¸ç®±é•¿
        /// </summary>
        public float? Info1 { get; set; }
        
        /// <summary>
        /// çº¸ç®±å®½
        /// </summary>
        public float? Info2 { get; set; }
        
        /// <summary>
        /// çº¸ç®±é«˜
        /// </summary>
        public float? Info3 { get; set; }
        
        /// <summary>
        /// é”€å”®åˆåŒå•å·
        /// </summary>
        public string? Info4 { get; set; }
        
        /// <summary>
        /// ç¬¬å‡ åŒ…
        /// </summary>
        public string? Info6 { get; set; }
        
        /// <summary>
        /// ç»é”€åº—名称
        /// </summary>
        public string? Info7 { get; set; }
        
        /// <summary>
        /// äº§å“åç§°
        /// </summary>
        public string? Info8 { get; set; }
        
        /// <summary>
        /// å®¢æˆ·åç§°
        /// </summary>
        public string? Info10 { get; set; }
        
        /// <summary>
        /// è‡ªæor发货
        /// </summary>
        public string? Info11 { get; set; }
        
        /// <summary>
        /// åŒ…装部件总数量
        /// </summary>
        public string? Info12 { get; set; }
        
        /// <summary>
        /// åŒ…装面积
        /// </summary>
        public string? Info13 { get; set; }
        
    }

    /// <summary>
    /// åŒ…队列数据增加输入参数
    /// </summary>
    public class AddMes_Package_LineQueueInput : Mes_Package_LineQueueBaseInput
    {
        /// <summary>
        /// åŒ…装号
        /// </summary>
        [Required(ErrorMessage = "包装号不能为空")]
        public override string PackageCode { get; set; }
        
        /// <summary>
        /// æ‰¹æ¬¡å·
        /// </summary>
        [Required(ErrorMessage = "批次号不能为空")]
        public override string PlanNo { get; set; }
        
        /// <summary>
        /// è®¢å•å·
        /// </summary>
        [Required(ErrorMessage = "订单号不能为空")]
        public override string OrderId { get; set; }
        
        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        [Required(ErrorMessage = "板料状态不能为空")]
        public override Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
        
        /// <summary>
        /// è½¯åˆ é™¤
        /// </summary>
        [Required(ErrorMessage = "软删除不能为空")]
        public override bool IsDelete { get; set; }
        
    }

    /// <summary>
    /// åŒ…队列数据删除输入参数
    /// </summary>
    public class DeleteMes_Package_LineQueueInput : BaseIdInput
    {
    }

    /// <summary>
    /// åŒ…队列数据更新输入参数
    /// </summary>
    public class UpdateMes_Package_LineQueueInput : AddMes_Package_LineQueueInput
    {
        /// <summary>
        /// ä¸»é”®Id
        /// </summary>
        [Required(ErrorMessage = "主键Id不能为空")]
        public long Id { get; set; }
        
    }

    /// <summary>
    /// åŒ…队列数据主键查询输入参数
    /// </summary>
    public class QueryByIdMes_Package_LineQueueInput : DeleteMes_Package_LineQueueInput
    {

    }

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_LineQueue/Dto/Mes_Package_LineQueueOutput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,135 @@
namespace Admin.NET.Application;

/// <summary>
/// åŒ…队列数据输出参数
/// </summary>
public class Mes_Package_LineQueueOutput
{
    /// <summary>
    /// ä¸»é”®Id
    /// </summary>
    public long? Id { get; set; }
    
    /// <summary>
    /// åŒ…装号
    /// </summary>
    public string PackageCode { get; set; }
    
    /// <summary>
    /// ç”Ÿäº§å•å·
    /// </summary>
    public string Info5 { get; set; }
    
    /// <summary>
    /// æ‰¹æ¬¡å·
    /// </summary>
    public string PlanNo { get; set; }
    
    /// <summary>
    /// è®¢å•å·
    /// </summary>
    public string OrderId { get; set; }
    
    /// <summary>
    /// æ‰€åœ¨åŒºåŸŸ
    /// </summary>
    public Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
    
    /// <summary>
    /// æ¿æ–™çŠ¶æ€
    /// </summary>
    public Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
    
    /// <summary>
    /// çº¸ç®±é•¿
    /// </summary>
    public float? Info1 { get; set; }
    
    /// <summary>
    /// çº¸ç®±å®½
    /// </summary>
    public float? Info2 { get; set; }
    
    /// <summary>
    /// çº¸ç®±é«˜
    /// </summary>
    public float? Info3 { get; set; }
    
    /// <summary>
    /// é”€å”®åˆåŒå•å·
    /// </summary>
    public string Info4 { get; set; }
    
    /// <summary>
    /// ç¬¬å‡ åŒ…
    /// </summary>
    public string Info6 { get; set; }
    
    /// <summary>
    /// ç»é”€åº—名称
    /// </summary>
    public string Info7 { get; set; }
    
    /// <summary>
    /// äº§å“åç§°
    /// </summary>
    public string Info8 { get; set; }
    
    /// <summary>
    /// å®¢æˆ·åç§°
    /// </summary>
    public string Info10 { get; set; }
    
    /// <summary>
    /// è‡ªæor发货
    /// </summary>
    public string Info11 { get; set; }
    
    /// <summary>
    /// åŒ…装部件总数量
    /// </summary>
    public string Info12 { get; set; }
    
    /// <summary>
    /// åŒ…装面积
    /// </summary>
    public string Info13 { get; set; }
    
    /// <summary>
    /// åˆ›å»ºæ—¶é—´
    /// </summary>
    public DateTime? CreateTime { get; set; }
    
    /// <summary>
    /// ä¿®æ”¹æ—¶é—´
    /// </summary>
    public DateTime? UpdateTime { get; set; }
    
    /// <summary>
    /// åˆ›å»ºäººId
    /// </summary>
    public long? CreateUserId { get; set; }
    
    /// <summary>
    /// åˆ›å»ºäºº
    /// </summary>
    public string CreateUserName { get; set; }
    
    /// <summary>
    /// ä¿®æ”¹äººId
    /// </summary>
    public long? UpdateUserId { get; set; }
    
    /// <summary>
    /// ä¿®æ”¹äºº
    /// </summary>
    public string UpdateUserName { get; set; }
    
    /// <summary>
    /// è½¯åˆ é™¤
    /// </summary>
    public bool IsDelete { get; set; }
    
    }
 


 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_LineQueue/Mes_Package_LineQueueService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,207 @@
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.WmsOrderGroupName, Order = 100)]
public class Mes_Package_LineQueueService : IDynamicApiController, ITransient
{
    private readonly SqlSugarRepository<Mes_Package_LineQueue> _rep;
    public Mes_Package_LineQueueService(SqlSugarRepository<Mes_Package_LineQueue> rep)
    {
        _rep = rep;
    }

    /// <summary>
    /// åˆ†é¡µæŸ¥è¯¢åŒ…队列数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Page")]
    [Description("Mes_Package_LineQueue/Page")]
    public async Task<SqlSugarPagedList<Mes_Package_LineQueueOutput>> Page(Mes_Package_LineQueueInput input)
    {
        var query = CommonPageFilter(input);
        return await query.OrderBuilder(input, "", "Id").ToPagedListAsync(input.Page, input.PageSize);
    }

    /// <summary>
    /// ä¸åˆ†é¡µæŸ¥è¯¢åŒ…队列数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpGet]
    [ApiDescriptionSettings(Name = "List")]
    [Description("Mes_Package_LineQueue/List")]
    public async Task<List<Mes_Package_LineQueueOutput>> List([FromQuery] Mes_Package_LineQueueInput input)
    {
        var query = CommonPageFilter(input);
        return await query.OrderBuilder(input, "", "Id").Select<Mes_Package_LineQueueOutput>().ToListAsync();
    }

    /// <summary>
    /// å¢žåŠ åŒ…队列数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Add")]
    [Description("Mes_Package_LineQueue/Add")]
    public async Task<long> Add(AddMes_Package_LineQueueInput input)
    {
        var entity = input.Adapt<Mes_Package_LineQueue>();

        //重复性验证
        await CheckExist(entity);

        await _rep.InsertAsync(entity);
        return entity.Id;
    }

    /// <summary>
    /// åˆ é™¤åŒ…队列数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Delete")]
    [Description("Mes_Package_LineQueue/Delete")]
    public async Task Delete(DeleteMes_Package_LineQueueInput input)
    {
        var entity = await _rep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
        //await _rep.FakeDeleteAsync(entity);   //假删除
        await _rep.DeleteAsync(entity);   //真删除
    }

    /// <summary>
    /// æ›´æ–°åŒ…队列数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Update")]
    [Description("Mes_Package_LineQueue/Update")]
    public async Task Update(UpdateMes_Package_LineQueueInput input)
    {
        var entity = input.Adapt<Mes_Package_LineQueue>();

        //重复性验证
        await CheckExist(entity,true);

        await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
    }

    /// <summary>
    /// èŽ·å–包队列数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpGet]
    [ApiDescriptionSettings(Name = "Detail")]
    [Description("Mes_Package_LineQueue/Detail")]
    public async Task<Mes_Package_LineQueue> Detail([FromQuery] QueryByIdMes_Package_LineQueueInput input)
    {
        return await _rep.GetFirstAsync(u => u.Id == input.Id);
    }






    #region ç§æœ‰æ–¹æ³•

    /// <summary>
    /// å…¬å…±æŸ¥è¯¢åŒ…队列数据条件
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    private ISugarQueryable<Mes_Package_LineQueueOutput> CommonPageFilter(Mes_Package_LineQueueInput input)
    {
        var query = _rep.AsQueryable()
            .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
                u.PackageCode.Contains(input.SearchKey.Trim())
                || u.Info5.Contains(input.SearchKey.Trim())
                || u.PlanNo.Contains(input.SearchKey.Trim())
                || u.OrderId.Contains(input.SearchKey.Trim())
                || u.Info4.Contains(input.SearchKey.Trim())
                || u.Info6.Contains(input.SearchKey.Trim())
                || u.Info7.Contains(input.SearchKey.Trim())
                || u.Info8.Contains(input.SearchKey.Trim())
                || u.Info10.Contains(input.SearchKey.Trim())
                || u.Info11.Contains(input.SearchKey.Trim())
                || u.Info12.Contains(input.SearchKey.Trim())
                || u.Info13.Contains(input.SearchKey.Trim())
                || u.CreateUserName.Contains(input.SearchKey.Trim())
                || u.UpdateUserName.Contains(input.SearchKey.Trim())
            )
            .WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.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(input.AreaCode.HasValue, u => u.AreaCode == input.AreaCode)
            .WhereIF(input.UpiStatus.HasValue, u => u.UpiStatus == input.UpiStatus)
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info4), u => u.Info4.Contains(input.Info4.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info6), u => u.Info6.Contains(input.Info6.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info7), u => u.Info7.Contains(input.Info7.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info8), u => u.Info8.Contains(input.Info8.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info10), u => u.Info10.Contains(input.Info10.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info11), u => u.Info11.Contains(input.Info11.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info12), u => u.Info12.Contains(input.Info12.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info13), u => u.Info13.Contains(input.Info13.Trim()))
            .Select<Mes_Package_LineQueueOutput>();
        return query;
       }

        /// <summary>
        /// é‡å¤æ€§éªŒè¯
        /// </summary>
        /// <param name="input">验证对象</param>
        /// <param name="isEdit">是否是编辑</param>
        /// <returns></returns>
        private async Task CheckExist( Mes_Package_LineQueue input,bool isEdit=false)
        {
           


            //没有配置组合校验，不需要验重

           
            //没有配置单独校验，不需要验重
       }

       /// <summary>
        /// æ ¹æ®ç»„合校验和单独校验验证数据是否已存在-导入时验证
        /// </summary>
        /// <param name="inputs"></param>
        /// <returns></returns>
        private async Task CheckExisitForImport(List<Mes_Package_LineQueue> inputs)
        { 
            if (inputs?.Count <= 0)
            {
                throw Oops.Oh($"导入数据不能为空");
            }
            //根据组合校验验证表格中中是否已存在相同数据  
                      






          
           //根据单独校验验证表格中中是否已存在相同数据  
           
           
           
        }
     #endregion

}


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

@@ -7,7 +7,7 @@
/// <summary>
/// åˆ¤æ–­é½å¥—输出参数
/// </summary>
public class ValidateQiTaoOutput: Mes_Package_Gather
public class ValidateQiTaoOutput
{

    /// <summary>
@@ -15,6 +15,106 @@
    /// </summary>
    public virtual string QiTaoReuslt { get; set; }


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

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

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

    [Required]
    [SugarColumn(ColumnName = "OrderId", ColumnDescription = "订单号", Length = 50)]
    public string OrderId { 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



    [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>
    /// è‡ªæ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; }

}