1
huangxiaoqiang
2025-02-18 31eba6a8c6261adf5bfef4dafad4dc8efc1f66a2
1
已修改5个文件
已添加1个文件
40 ■■■■■ 文件已修改
Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目资料/通信协议/1_二楼9#交互偏移量地址20241027.xls 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
@@ -26,8 +26,22 @@
      url: "/Task/",
      sortName: "CreateDate",
    });
    const editFormFields = ref({});
    const editFormOptions = ref([]);
    const editFormFields = ref({
      taskNum:"",
      palletCode: "",
      roadway: "",
      taskType:"",
      taskState:"",
      wMSId:"",
      sourceAddress: "",
      targetAddress: "",
      currentAddress: "",
      nextAddress: "",
      creater: "",
      createDate: "",
      grade: "",
    });
    const editFormOptions = ref([[{ title: "优先级", field: "grade", type: "int" },]]);
    const searchFormFields = ref({
      taskNum: "",
      palletCode: "",
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs
@@ -132,7 +132,7 @@
                            }
                        }
                        if (childDeviceCode == "1670")
                        if (childDeviceCode == "1670"||childDeviceCode=="1666"||childDeviceCode=="1548"||childDeviceCode=="1448")
                        {
                            Platform platform = _platFormRepository.QueryFirst(x => x.PLCCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active");
                            if (platform != null)
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue
@@ -57,8 +57,8 @@
            cnName: "组盘明细信息",
            table: "DtBoxingInfoDetail",
            columns: [
                { title: "电芯序列号", field: "serialNumber", type: "text" },
                { title: "物料编号", field: "materielCode", type: "text" },
                { title: "电芯序列号", field: "serialNumber", type: "text"},
                { title: "物料编号", field: "materielCode",type: "text" },
                { title: "物料名称", field: "materielName", type: "text" },
                { title: "库存状态", field: "status", type: "text" },
                { title: "组盘数量", field: "stockQuantity", type: "text" },
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue
@@ -23,22 +23,11 @@
            sortName: "TaskId"
        });
        const editFormFields = ref({
            "taskNum": "",
            "palletCode": ""
            "grade": "",
        });
        const editFormOptions = ref([
            [
                { "title": "任务号", "field": "taskNum", "type": "text" },
                { "title": "托盘号", "field": "palletCode", "type": "text" },
                { "title": "任务类型", "field": "taskType", "type": "select", dataKey: "TaskType", data: [] },
                { "title": "任务状态", "field": "taskState", "type": "select", dataKey: "TaskStatus", data: [] },
            ],
            [
                { "title": "起始位置", "field": "sourceAddress", type: "text" },
                { "title": "当前位置", "field": "currentAddress", type: "text" },
                { "title": "下一位置", "field": "nextAddress", type: "text" },
                { "title": "目标位置", "field": "targetAddress", type: "text" },
                { "title": "优先级", "field": "grade", type: "text" },
            ],
        ]);
        const searchFormFields = ref({
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -1026,6 +1026,7 @@
                var boxing = CreateBoxingInfo(result, input.PalletCode);
                if (boxing == null) return content.Error("组盘失败");
                input.ProductionLine = result.ProductionLine;
                return await ProcessBasedOnProcessCode(boxing, area, input, result);
            }
        }
ÏîÄ¿×ÊÁÏ/ͨÐÅЭÒé/1_¶þÂ¥9#½»»¥Æ«ÒÆÁ¿µØÖ·20241027.xls
Binary files differ