优化页面

huangxiaoqiang

2025-02-15 bcde5ea70330cb16597c2320b94b5f1d7cb15752

优化页面

 Code Management/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_needBarcode.vue

@@ -24,19 +24,19 @@
            sortName: "AreaCode"
        });
        const editFormFields = ref({
            // "toArea": "",
            // "fromArea": "",
            // "barcodeType": "",
            "toArea": "",
            "fromArea": "",
            "barcodeType": "",
            "productLine": "",
            "inLineNum": "",
            "cacheNum":""
        });
        const editFormOptions = ref([
            // [
            //     { "title": "目标库区", "field": "toArea", type: "text" },
            //     { "title": "来源库区", "field": "fromArea", type: "text" },
            //     { "title": "托盘类型", "field": "barcodeType", type: "text" },
            // ],
            [
                { "title": "目标库区", "field": "toArea", type: "text" },
                { "title": "来源库区", "field": "fromArea", type: "text" },
                { "title": "托盘类型", "field": "barcodeType", type: "text" },
            ],
            [
                { "title": "所属产线", "field": "productLine", type: "text" },
                { "title": "在途数量", "field": "inLineNum", type: "text" },
@@ -45,11 +45,11 @@
        ]);
        const searchFormFields = ref({});
        const searchFormOptions = ref([
            // [
            //     { "title": "目标库区", "field": "toArea", type: "text" },
            //     { "title": "来源库区", "field": "fromArea", type: "text" },
            //     { "title": "托盘类型", "field": "barcodeType", type: "text" },
            // ],
            [
                { "title": "目标库区", "field": "toArea", type: "text" },
                { "title": "来源库区", "field": "fromArea", type: "text" },
                { "title": "托盘类型", "field": "barcodeType", type: "text" },
            ],
            [
                { "title": "所属产线", "field": "productLine", type: "text" },
                { "title": "在途数量", "field": "inLineNum", type: "text" },
@@ -57,10 +57,10 @@
            ]
        ]);
        const columns = ref([{ field: 'ID', title: '主键', type: 'int', sort: true, hidden: true, width: 110, readonly: true, require: true, align: 'left' },
        //{ field: 'toArea', title: '目标库区', type: 'string', sort: true, width: 110, require: true, align: 'left', sort: true },
        //{ field: 'fromArea', title: '来源库区', type: 'string', sort: true, width: 110, align: 'left' },
        //{ field: 'barcodeType', title: '托盘类型', type: 'string', sort: true, width: 110, align: 'left' },
        { field: 'productLine', title: '所属产线', type: 'string', sort: true, width: 110, align: 'left',},
        { field: 'toArea', title: '目标库区', type: 'string', sort: true, width: 110, require: true, align: 'left', sort: true },
        { field: 'fromArea', title: '来源库区', type: 'string', sort: true, width: 110, align: 'left' },
        { field: 'barcodeType', title: '托盘类型', type: 'string', sort: true, width: 110, align: 'left' },
        { field: 'productLine', title: '所属产线', type: 'string', sort: true, width: 110, align: 'left',bind: { key: "ProductionLine", data: [] } },
        { field: 'inLineNum', title: '在途数量', type: 'int', sort: true, width: 110, align: 'left' },
        { field: 'cacheNum', title: '可缓存数量', type: 'int', sort: true, width: 100,  align: 'left' },
        { field: 'creater', title: '创建人', type: 'string', sort: true, width: 110, align: 'left' },

 Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue

@@ -152,7 +152,8 @@
        title: "产线",
        type: "string",
        width: 70,
        align: "left",
        align: "left", 
        bind: { key: "ProductionLine", data: [] } 
      },
      {
        field: "exceptionMessage",

 Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue

@@ -153,6 +153,7 @@
        type: "string",
        width: 70,
        align: "left",
        bind: { key: "ProductionLine", data: [] } 
      },
      {
        field: "exceptionMessage",

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs

@@ -85,17 +85,24 @@
                {
                    return content.Error("当前托盘存在任务");
                }

                var Station = await _stationManagerRepository.QueryFirstAsync(x => x.stationType == 6 && x.productLine == stationManager.productLine && x.stationArea == stationManager.stationArea);
               var tasks= await BaseDal.QueryFirstAsync(x => x.TaskType == (int)TaskOutboundTypeEnum.InToOut && x.TargetAddress == stationManager.stationLocation && x.CurrentAddress == Station.stationChildCode);
                if(tasks!=null)
                {
                    ConsoleHelper.WriteErrorLine($"【{stationManager.stationChildCode}】已存在直接出库任务任务");
                    return content.Error($"【{stationManager.stationChildCode}】已存在直接出库任务任务");
                }
                if (stationManager.stationType == 7)
                {
                    var Station = await _stationManagerRepository.QueryFirstAsync(x => x.stationType == 6 && x.productLine == stationManager.productLine && x.stationArea == stationManager.stationArea);
                    var runTask = await BaseDal.QueryFirstAsync(x => x.SourceAddress == Station.stationChildCode && x.TaskState == (int)TaskInStatusEnum.InNew && x.TaskType == (int)TaskInboundTypeEnum.InTray);
                    
                    var runTask = await BaseDal.QueryFirstAsync(x => x.CurrentAddress == Station.stationChildCode && x.TaskState == (int)TaskInStatusEnum.Line_InFinish && x.TaskType == (int)TaskInboundTypeEnum.InTray);
                    if (runTask != null)
                    {
                        runTask.TargetAddress = stationManager.stationLocation;
                        runTask.NextAddress = stationManager.stationChildCode;
                        runTask.Grade = 3;
                        runTask.TaskType = (int)TaskOutboundTypeEnum.InToOut;
                        runTask.TaskState = (int)TaskOutStatusEnum.OutNew;

                        var config1 = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
                        var wmsBase1 = config1.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
@@ -106,18 +113,19 @@
                        }
                        var wmsIpAddrss1 = wmsBase1 + requestTask1;

                        var result1 = await HttpHelper.PostAsync(wmsIpAddrss1, new { palletCode = runTask.PalletCode, EquiCodeMOM = stationManager.stationEquipMOM, Roadways = stationManager.Roadway, area = stationManager.stationArea, Position = stationManager.stationChildCode }.ToJsonString());
                        var result1 = await HttpHelper.PostAsync(wmsIpAddrss1, new { palletCode = runTask.PalletCode, EquiCodeMOM = stationManager.stationEquipMOM, Roadways = stationManager.Roadway, area = stationManager.stationArea, Position = Station.stationChildCode }.ToJsonString());
                        content = JsonConvert.DeserializeObject<WebResponseContent>(result1);
                        if (content.Status)
                        {
                            await BaseDal.UpdateDataAsync(runTask);
                            ConsoleHelper.WriteSuccessLine($"【{runTask.PalletCode}直接出库至二封】");
                            return content.OK("成功");
                        }
                        else
                            ConsoleHelper.WriteErrorLine(content.Message);
                    }
                    else
                        ConsoleHelper.WriteErrorLine("未找到空托盘入库任务");
                        ConsoleHelper.WriteErrorLine($"【{Station.stationChildCode}】未找到空托盘入库任务");
                }

                var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);

 Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/basicinfo/demo_Product/LocationChange.vue

@@ -62,6 +62,7 @@
        //自定义按钮
        customOpen(row) {
            this.locationCode = row.locationCode;
            this.locationId = row.id;
            this.model = true;
            this.$nextTick(() => {
                this.$refs.table.load(null, true);
@@ -71,9 +72,9 @@
        loadBefore(params, callBack) {//调用后台接口前处理
            //设置查询条件参数
            params.wheres.push({
                name: "locationCode",
                value: this.locationCode,
                displayType: "like"//模糊查询
                name: "locationId",
                value: this.locationId,
                displayType: "text"//模糊查询
            })

            //也可以给value设置值，后台自己解析

 Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxing.vue

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue

@@ -49,7 +49,7 @@
            { field: 'isFull', title: '是否满盘', type: 'bool', width: 110, align: 'left' },
            // { field: 'state', title: '库存状态', type: 'int', width: 110, align: 'left', bind: { key: "StockState", data: [] } },
            { field: 'remark', title: '备注', type: 'string', width: 120, align: 'left' },
            { field: 'productionLine', title: '产线', type: 'string', width: 70, align: 'left' },
            { field: 'productionLine', title: '产线', type: 'string', width: 70, align: 'left' , bind: { key: "ProductionLine", data: [] } },
            { field: 'createDate', title: '创建时间', type: 'int', sort: true, width: 100, align: 'left' },
        ]);


 Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue

@@ -78,7 +78,7 @@
        { field: 'nextAddress', title: '下一位置', type: 'string', width: 110, align: 'left' },
        { field: 'targetAddress', title: '目标位置', type: 'string', width: 110, align: 'left' },
        { field: 'grade', title: '优先级', type: 'int', width: 60, align: 'left' },
        { field: 'productionLine', title: '产线', type: 'string', width: 70, align: 'left' },
        { field: 'productionLine', title: '产线', type: 'string', width: 70, align: 'left', bind: { key: "ProductionLine", data: [] }  },
        { field: 'processCode', title: '工序', type: 'string', width: 90, align: 'left' },
        { field: 'dispatchertime', title: '任务下发时间', type: 'datetime', width: 150, align: 'left', sort: true },
        { field: 'remark', title: '备注', type: 'string', width: 110, align: 'left',hidden: true, },

 Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue

@@ -78,7 +78,7 @@
        { field: 'nextAddress', title: '下一位置', type: 'string', width: 110, align: 'left' },
        { field: 'targetAddress', title: '目标位置', type: 'string', width: 110, align: 'left' },
        { field: 'grade', title: '优先级', type: 'int', width: 60, align: 'left' },
        { field: 'productionLine', title: '产线', type: 'string', width: 70, align: 'left' },
        { field: 'productionLine', title: '产线', type: 'string', width: 70, align: 'left', bind: { key: "ProductionLine", data: [] }  },
        { field: 'processCode', title: '工序', type: 'string', width: 90, align: 'left' },
        { field: 'dispatchertime', title: '任务下发时间', type: 'datetime', width: 150, align: 'left', sort: true },
        { field: 'operateType', title: '操作类型', type: 'string', width: 110, align: 'left', bind: { key: "operateType", data: [] }},

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/NotifyFinishTest.cs

@@ -62,7 +62,7 @@
                    CreateDate = DateTime.Now,
                    Creater = "HK",
                    CurrentAddress = result.LocationID,
                    Grade = 1,
                    Grade = result.IsNG == 1 ? 1 : 2,
                    Dispatchertime = DateTime.Now,
                    PalletCode = result.PalletBarcode,
                    Roadway = location.RoadwayNo,
@@ -79,7 +79,7 @@
                WMSTaskDTO taskDTO = new WMSTaskDTO()
                {
                    TaskNum = task.TaskNum.Value,
                    Grade = 1,
                    Grade = result.IsNG == 1 ? 1 : 2,
                    PalletCode = task.PalletCode,
                    RoadWay = task.Roadway,
                    SourceAddress = task.SourceAddress,

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs

@@ -1166,12 +1166,13 @@
            var toStation = await _stationManagerRepository.QueryFirstAsync(x => x.stationType == 7 && x.productLine == fromStation.productLine && x.stationArea == fromStation.stationArea);
            if (!toStation.IsNullOrEmpty())
            {
                var location = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress && x.AreaId == int.Parse(fromStation.stationArea));
                task.TargetAddress = toStation.stationLocation;
                task.NextAddress = toStation.stationChildCode;
                task.Grade = 3;
                task.TaskType = (int)TaskOutboundTypeEnum.InToOut;
                task.TaskState = (int)TaskOutStatusEnum.OutNew;

                var location = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
                location.LocationStatus = (int)LocationEnum.Free;

                await _locationRepository.UpdateDataAsync(location);

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs

@@ -145,6 +145,19 @@
        {
            throw new Exception("未找到入库站台配置");
        }
        //List<string> strings;
        //if (areaIn == "GWSC1")
        //{
        //    strings = new List<string>
        //    {
        //        (boxing.ProductionLine != null && boxing.ProductionLine == "ZJ-7") ? "GWSC1" : "GWSC2"
        //    };
        //}
        //else
        //{
        //    strings = stationManagers.Roadway.Split(',').ToList();
        //}

        List<string> strings = stationManagers.Roadway.Split(',').ToList();

        var resultContent = await CreateNewTask(input, result.ProductionLine, boxing.ProcessCode, strings);