HuaYiZhongHeng/BaiBuLiKu.git

huangxiaoqiang

2025-02-12 4b50d62ea690e5c323c6d331a675617a320a7345

前端更新

已修改7个文件

	Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue	40 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue	39 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -66,6 +66,7 @@
      ],
      [
        { title: "巷道号", field: "roadway", type: "like" },
        { "title": "生产产线", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
        { title: "创建人", field: "creater", type: "like" },
        { title: "创建时间", field: "createDate", type: "datetime" },
      ],
@@ -147,6 +148,13 @@
        align: "left",
      },
      {
        field: "productionLine",
        title: "产线",
        type: "string",
        width: 70,
        align: "left",
      },
      {
        field: "exceptionMessage",
        title: "异常信息",
        type: "string",
@@ -158,7 +166,7 @@
        field: "grade",
        title: "优先级",
        type: "int",
        width: 80,
        width: 60,
        align: "left",
      },
      {
@@ -176,6 +184,22 @@
        align: "left",
        hidden: true,
      },
      
      {
        field: "createDate",
        title: "创建时间",
        type: "datetime",
        width: 150,
        align: "left",
      },
      
      {
        field: "modifyDate",
        title: "修改时间",
        type: "datetime",
        width: 160,
        align: "left",
      },
      {
        field: "creater",
        title: "创建人",
@@ -184,24 +208,10 @@
        align: "left",
      },
      {
        field: "createDate",
        title: "创建时间",
        type: "datetime",
        width: 150,
        align: "left",
      },
      {
        field: "modifier",
        title: "修改人",
        type: "string",
        width: 90,
        align: "left",
      },
      {
        field: "modifyDate",
        title: "修改时间",
        type: "datetime",
        width: 160,
        align: "left",
      },
      {

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

@@ -66,6 +66,7 @@
      ],
      [
        { title: "巷道号", field: "roadway", type: "like" },
        { title: "生产产线", field: "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
        { title: "创建人", field: "creater", type: "like" },
        { title: "创建时间", field: "createDate", type: "datetime" },
      ],
@@ -147,6 +148,13 @@
        align: "left",
      },
      {
        field: "productionLine",
        title: "产线",
        type: "string",
        width: 70,
        align: "left",
      },
      {
        field: "exceptionMessage",
        title: "异常信息",
        type: "string",
@@ -158,7 +166,7 @@
        field: "grade",
        title: "优先级",
        type: "int",
        width: 80,
        width: 60,
        align: "left",
      },
      {
@@ -176,13 +184,7 @@
        align: "left",
        hidden: true,
      },
      {
        field: "creater",
        title: "创建人",
        type: "string",
        width: 90,
        align: "left",
      },
      
      {
        field: "createDate",
        title: "创建时间",
@@ -191,13 +193,6 @@
        align: "left",
      },
      {
        field: "modifier",
        title: "修改人",
        type: "string",
        width: 100,
        align: "left",
      },
      {
        field: "modifyDate",
        title: "修改时间",
        type: "datetime",
@@ -205,6 +200,20 @@
        align: "left",
      },
      {
        field: "creater",
        title: "创建人",
        type: "string",
        width: 90,
        align: "left",
      },
      {
        field: "modifier",
        title: "修改人",
        type: "string",
        width: 90,
        align: "left",
      },
      {
        field: "remark",
        title: "备注",
        type: "string",

 Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue

@@ -35,8 +35,12 @@
            [
                { "title": "货位编号", "field": "locationCode", type: "text" },
                { "title": "货位状态", "field": "locationStatus", "type": "select", dataKey: "LocationState", data: [] },
                // { "title": "对应堆垛机号", "field": "sCNo", type: "text" },
                { "title": "巷道编号", "field": "roadWayNO", type: "text" },
            ],
            [
                { "title": "行", "field": "row", type: "text" },
                { "title": "列", "field": "column", "type": "text" },
                { "title": "层", "field": "layer", type: "text" },
            ]
        ]);
        const columns = ref([{ field: 'locationID', title: '货位ID', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },

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

@@ -36,6 +36,10 @@
                { "title": "物料编号", "field": "materielCode", type: "text" },
                { "title": "库存状态", "field": "status", type: "select", dataKey: "StockState", data: [] },
                { "title": "组盘类型", "field": "groupType", type: "select", dataKey: "GroupType", data: [] },
            ],
            [
            { "title": "生产产线", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
                
            ]
        ]);
        const columns = ref([
@@ -45,6 +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: 'createDate', title: '创建时间', type: 'int', sort: true, width: 100, align: 'left' },
        ]);


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

@@ -59,6 +59,7 @@
            ],
            [
                { "title": "巷道", "field": "roadway", type: "text" },
                { "title": "生产产线", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
                { "title": "创建人", "field": "creater", type: "text" },
                { "title": "创建时间", "field": "createDate", type: "datetime" },
            ],
@@ -76,13 +77,15 @@
        { field: 'currentAddress', title: '当前位置', type: 'string', width: 110, align: 'left' },
        { field: 'nextAddress', title: '下一位置', type: 'string', width: 110, align: 'left' },
        { field: 'targetAddress', title: '目标位置', type: 'string', width: 110, align: 'left' },
        { field: 'grade', title: '优先级', type: 'int', width: 110, align: 'left' },
        { field: 'grade', title: '优先级', type: 'int', width: 60, align: 'left' },
        { field: 'productionLine', title: '产线', type: 'string', width: 70, align: 'left' },
        { 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' },
        { field: 'creater', title: '创建人', type: 'string', sort: true, width: 110, align: 'left' },
        { field: 'remark', title: '备注', type: 'string', width: 110, align: 'left',hidden: true, },
        { field: 'createDate', title: '创建时间', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
        { field: 'modifier', title: '修改人', type: 'string', sort: true, width: 100, align: 'left' },
        { field: 'modifyDate', title: '修改时间', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
        { field: 'creater', title: '创建人', type: 'string', sort: true, width: 110, align: 'left' },
        { field: 'modifier', title: '修改人', type: 'string', sort: true, width: 100, align: 'left' },
        { field: 'locationCode', title: '货位号', type: 'string', width: 110, hidden: true, align: 'left' },
        { field: 'materialNo', title: '物料编号', type: 'string', width: 110, hidden: true, align: 'left' },
        { field: 'targetAddress', title: '目标地址', type: 'string', width: 110, hidden: true, align: 'left' },

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

@@ -59,6 +59,7 @@
            ],
            [
                { "title": "巷道", "field": "roadway", type: "text" },
                { "title": "生产产线", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
                { "title": "创建人", "field": "creater", type: "text" },
                { "title": "创建时间", "field": "createDate", type: "datetime" },
            ],
@@ -76,14 +77,16 @@
        { field: 'currentAddress', title: '当前位置', type: 'string', width: 110, align: 'left' },
        { field: 'nextAddress', title: '下一位置', type: 'string', width: 110, align: 'left' },
        { field: 'targetAddress', title: '目标位置', type: 'string', width: 110, align: 'left' },
        { field: 'grade', title: '优先级', type: 'int', width: 110, align: 'left' },
        { field: 'grade', title: '优先级', type: 'int', width: 60, align: 'left' },
        { field: 'productionLine', title: '产线', type: 'string', width: 70, align: 'left' },
        { 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: [] }},
        { field: 'remark', title: '备注', type: 'string', width: 110, align: 'left' },
        { field: 'creater', title: '创建人', type: 'string', sort: true, width: 110, align: 'left' },
        { field: 'remark', title: '备注', type: 'string', width: 110, align: 'left',hidden: true, },
        { field: 'createDate', title: '创建时间', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
        { field: 'modifier', title: '修改人', type: 'string', sort: true, width: 100, align: 'left' },
        { field: 'modifyDate', title: '修改时间', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
        { field: 'creater', title: '创建人', type: 'string', sort: true, width: 110, align: 'left' },
        { field: 'modifier', title: '修改人', type: 'string', sort: true, width: 100, align: 'left' },
        { field: 'locationCode', title: '货位号', type: 'string', width: 110, hidden: true, align: 'left' },
        { field: 'materialNo', title: '物料编号', type: 'string', width: 110, hidden: true, align: 'left' },
        { field: 'targetAddress', title: '目标地址', type: 'string', width: 110, hidden: true, align: 'left' },

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

@@ -3,6 +3,7 @@
using WIDESEA_Core.Const;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
using WIDESEAWCS_Model.Models;

namespace WIDESEA_StorageTaskServices;

			@@ -66,6 +66,7 @@
			],
			[
			{ title: "巷道号", field: "roadway", type: "like" },
			{ "title": "生产产线", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
			{ title: "创建人", field: "creater", type: "like" },
			{ title: "创建时间", field: "createDate", type: "datetime" },
			],
			@@ -147,6 +148,13 @@
			align: "left",
			},
			{
			field: "productionLine",
			title: "产线",
			type: "string",
			width: 70,
			align: "left",
			},
			{
			field: "exceptionMessage",
			title: "异常信息",
			type: "string",
			@@ -158,7 +166,7 @@
			field: "grade",
			title: "优先级",
			type: "int",
			width: 80,
			width: 60,
			align: "left",
			},
			{
			@@ -176,6 +184,22 @@
			align: "left",
			hidden: true,
			},

			{
			field: "createDate",
			title: "创建时间",
			type: "datetime",
			width: 150,
			align: "left",
			},

			{
			field: "modifyDate",
			title: "修改时间",
			type: "datetime",
			width: 160,
			align: "left",
			},
			{
			field: "creater",
			title: "创建人",
			@@ -184,24 +208,10 @@
			align: "left",
			},
			{
			field: "createDate",
			title: "创建时间",
			type: "datetime",
			width: 150,
			align: "left",
			},
			{
			field: "modifier",
			title: "修改人",
			type: "string",
			width: 90,
			align: "left",
			},
			{
			field: "modifyDate",
			title: "修改时间",
			type: "datetime",
			width: 160,
			align: "left",
			},
			{

			@@ -66,6 +66,7 @@
			],
			[
			{ title: "巷道号", field: "roadway", type: "like" },
			{ title: "生产产线", field: "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
			{ title: "创建人", field: "creater", type: "like" },
			{ title: "创建时间", field: "createDate", type: "datetime" },
			],
			@@ -147,6 +148,13 @@
			align: "left",
			},
			{
			field: "productionLine",
			title: "产线",
			type: "string",
			width: 70,
			align: "left",
			},
			{
			field: "exceptionMessage",
			title: "异常信息",
			type: "string",
			@@ -158,7 +166,7 @@
			field: "grade",
			title: "优先级",
			type: "int",
			width: 80,
			width: 60,
			align: "left",
			},
			{
			@@ -176,13 +184,7 @@
			align: "left",
			hidden: true,
			},
			{
			field: "creater",
			title: "创建人",
			type: "string",
			width: 90,
			align: "left",
			},

			{
			field: "createDate",
			title: "创建时间",
			@@ -191,13 +193,6 @@
			align: "left",
			},
			{
			field: "modifier",
			title: "修改人",
			type: "string",
			width: 100,
			align: "left",
			},
			{
			field: "modifyDate",
			title: "修改时间",
			type: "datetime",
			@@ -205,6 +200,20 @@
			align: "left",
			},
			{
			field: "creater",
			title: "创建人",
			type: "string",
			width: 90,
			align: "left",
			},
			{
			field: "modifier",
			title: "修改人",
			type: "string",
			width: 90,
			align: "left",
			},
			{
			field: "remark",
			title: "备注",
			type: "string",

			@@ -35,8 +35,12 @@
			[
			{ "title": "货位编号", "field": "locationCode", type: "text" },
			{ "title": "货位状态", "field": "locationStatus", "type": "select", dataKey: "LocationState", data: [] },
			// { "title": "对应堆垛机号", "field": "sCNo", type: "text" },
			{ "title": "巷道编号", "field": "roadWayNO", type: "text" },
			],
			[
			{ "title": "行", "field": "row", type: "text" },
			{ "title": "列", "field": "column", "type": "text" },
			{ "title": "层", "field": "layer", type: "text" },
			]
			]);
			const columns = ref([{ field: 'locationID', title: '货位ID', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },

			@@ -36,6 +36,10 @@
			{ "title": "物料编号", "field": "materielCode", type: "text" },
			{ "title": "库存状态", "field": "status", type: "select", dataKey: "StockState", data: [] },
			{ "title": "组盘类型", "field": "groupType", type: "select", dataKey: "GroupType", data: [] },
			],
			[
			{ "title": "生产产线", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },

			]
			]);
			const columns = ref([
			@@ -45,6 +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: 'createDate', title: '创建时间', type: 'int', sort: true, width: 100, align: 'left' },
			]);

			@@ -59,6 +59,7 @@
			],
			[
			{ "title": "巷道", "field": "roadway", type: "text" },
			{ "title": "生产产线", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
			{ "title": "创建人", "field": "creater", type: "text" },
			{ "title": "创建时间", "field": "createDate", type: "datetime" },
			],
			@@ -76,13 +77,15 @@
			{ field: 'currentAddress', title: '当前位置', type: 'string', width: 110, align: 'left' },
			{ field: 'nextAddress', title: '下一位置', type: 'string', width: 110, align: 'left' },
			{ field: 'targetAddress', title: '目标位置', type: 'string', width: 110, align: 'left' },
			{ field: 'grade', title: '优先级', type: 'int', width: 110, align: 'left' },
			{ field: 'grade', title: '优先级', type: 'int', width: 60, align: 'left' },
			{ field: 'productionLine', title: '产线', type: 'string', width: 70, align: 'left' },
			{ 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' },
			{ field: 'creater', title: '创建人', type: 'string', sort: true, width: 110, align: 'left' },
			{ field: 'remark', title: '备注', type: 'string', width: 110, align: 'left',hidden: true, },
			{ field: 'createDate', title: '创建时间', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
			{ field: 'modifier', title: '修改人', type: 'string', sort: true, width: 100, align: 'left' },
			{ field: 'modifyDate', title: '修改时间', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
			{ field: 'creater', title: '创建人', type: 'string', sort: true, width: 110, align: 'left' },
			{ field: 'modifier', title: '修改人', type: 'string', sort: true, width: 100, align: 'left' },
			{ field: 'locationCode', title: '货位号', type: 'string', width: 110, hidden: true, align: 'left' },
			{ field: 'materialNo', title: '物料编号', type: 'string', width: 110, hidden: true, align: 'left' },
			{ field: 'targetAddress', title: '目标地址', type: 'string', width: 110, hidden: true, align: 'left' },

			@@ -3,6 +3,7 @@
			using WIDESEA_Core.Const;
			using WIDESEA_DTO.MOM;
			using WIDESEA_DTO.WMS;
			using WIDESEAWCS_Model.Models;

			namespace WIDESEA_StorageTaskServices;