Pre-merge

This commit is contained in:
2026-04-03 17:42:41 +00:00
parent 5f6d54e72c
commit ef9e518e01
2 changed files with 282 additions and 193 deletions

View File

@@ -5,18 +5,22 @@
"borderColor": "#E0DEDE",
"borderRadius": "0.375rem",
"borderWidth": 1,
"bottomRow": 122,
"bottomRow": 124,
"boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}",
"children": [
{
"borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
"bottomRow": 1130,
"bottomRow": 1150,
"boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}",
"canExtend": true,
"detachFromLayout": true,
"dynamicBindingPathList": [
{"key": "borderRadius"},
{"key": "boxShadow"}
{
"key": "borderRadius"
},
{
"key": "boxShadow"
}
],
"dynamicHeight": "AUTO_HEIGHT",
"dynamicTriggerPathList": [],
@@ -52,13 +56,17 @@
},
{
"borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
"bottomRow": 1130,
"bottomRow": 1150,
"boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}",
"canExtend": true,
"detachFromLayout": true,
"dynamicBindingPathList": [
{"key": "borderRadius"},
{"key": "boxShadow"}
{
"key": "borderRadius"
},
{
"key": "boxShadow"
}
],
"dynamicHeight": "AUTO_HEIGHT",
"dynamicTriggerPathList": [],
@@ -95,8 +103,12 @@
],
"defaultTab": "WO Shortages",
"dynamicBindingPathList": [
{"key": "accentColor"},
{"key": "boxShadow"}
{
"key": "accentColor"
},
{
"key": "boxShadow"
}
],
"dynamicHeight": "AUTO_HEIGHT",
"dynamicTriggerPathList": [],

View File

@@ -44,48 +44,91 @@
"short_part_desc",
"qty_required",
"qty_issued",
"qty_onhand"
"qty_onhand",
"due_group_sort"
],
"columnUpdatedAt": 1775238074046,
"columnWidthMap": {
"due_group": 100,
"wo_num": 100,
"wo_status": 70,
"wo_duedate": 100,
"customer_name": 200,
"wo_item": 80,
"due_group": 100,
"qty_issued": 80,
"qty_onhand": 80,
"qty_required": 80,
"short_part": 80,
"shortage_type": 65,
"sub_wo_num": 110,
"short_part": 80,
"qty_required": 80,
"qty_issued": 80,
"qty_onhand": 80
"wo_duedate": 100,
"wo_item": 80,
"wo_num": 100,
"wo_status": 70
},
"compactMode": "SHORT",
"defaultPageSize": 0,
"defaultSelectedRowIndex": 0,
"defaultSelectedRowIndices": [0],
"defaultSelectedRowIndices": [
0
],
"delimiter": ",",
"dynamicBindingPathList": [
{"key": "accentColor"},
{"key": "boxShadow"},
{"key": "tableData"},
{"key": "primaryColumns.due_group.computedValue"},
{"key": "primaryColumns.wo_num.computedValue"},
{"key": "primaryColumns.wo_status.computedValue"},
{"key": "primaryColumns.wo_duedate.computedValue"},
{"key": "primaryColumns.customer_name.computedValue"},
{"key": "primaryColumns.wo_item.computedValue"},
{"key": "primaryColumns.wo_descrip.computedValue"},
{"key": "primaryColumns.shortage_type.computedValue"},
{"key": "primaryColumns.sub_wo_num.computedValue"},
{"key": "primaryColumns.short_part.computedValue"},
{"key": "primaryColumns.short_part_desc.computedValue"},
{"key": "primaryColumns.qty_required.computedValue"},
{"key": "primaryColumns.qty_issued.computedValue"},
{"key": "primaryColumns.qty_onhand.computedValue"}
{
"key": "accentColor"
},
{
"key": "boxShadow"
},
{
"key": "tableData"
},
{
"key": "primaryColumns.due_group.computedValue"
},
{
"key": "primaryColumns.wo_num.computedValue"
},
{
"key": "primaryColumns.wo_status.computedValue"
},
{
"key": "primaryColumns.wo_duedate.computedValue"
},
{
"key": "primaryColumns.customer_name.computedValue"
},
{
"key": "primaryColumns.wo_item.computedValue"
},
{
"key": "primaryColumns.wo_descrip.computedValue"
},
{
"key": "primaryColumns.shortage_type.computedValue"
},
{
"key": "primaryColumns.sub_wo_num.computedValue"
},
{
"key": "primaryColumns.short_part.computedValue"
},
{
"key": "primaryColumns.short_part_desc.computedValue"
},
{
"key": "primaryColumns.qty_required.computedValue"
},
{
"key": "primaryColumns.qty_issued.computedValue"
},
{
"key": "primaryColumns.qty_onhand.computedValue"
},
{
"key": "primaryColumns.due_group_sort.computedValue"
}
],
"dynamicPropertyPathList": [
{"key": "textSize"}
{
"key": "textSize"
}
],
"dynamicTriggerPathList": [],
"enableClientSideSearch": true,
@@ -107,106 +150,6 @@
"parentId": "ws1cnvstab1",
"parentRowSpace": 10,
"primaryColumns": {
"due_group": {
"alias": "due_group",
"allowCellWrapping": false,
"allowSameOptionsInNewRow": true,
"columnType": "text",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"due_group\"])) : due_group })()}}",
"enableFilter": true,
"enableSort": true,
"horizontalAlignment": "LEFT",
"id": "due_group",
"index": 0,
"isCellEditable": false,
"isCellVisible": true,
"isDerived": false,
"isDisabled": false,
"isEditable": false,
"isVisible": true,
"label": "due_group",
"originalId": "due_group",
"sticky": "",
"textSize": "0.775rem",
"validation": {},
"verticalAlignment": "CENTER",
"width": 150
},
"wo_num": {
"alias": "wo_num",
"allowCellWrapping": false,
"allowSameOptionsInNewRow": true,
"columnType": "text",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"wo_num\"])) : wo_num })()}}",
"enableFilter": true,
"enableSort": true,
"horizontalAlignment": "LEFT",
"id": "wo_num",
"index": 1,
"isCellEditable": false,
"isCellVisible": true,
"isDerived": false,
"isDisabled": false,
"isEditable": false,
"isVisible": true,
"label": "wo_num",
"originalId": "wo_num",
"sticky": "",
"textSize": "0.775rem",
"validation": {},
"verticalAlignment": "CENTER",
"width": 150
},
"wo_status": {
"alias": "wo_status",
"allowCellWrapping": false,
"allowSameOptionsInNewRow": true,
"columnType": "text",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"wo_status\"])) : wo_status })()}}",
"enableFilter": true,
"enableSort": true,
"horizontalAlignment": "LEFT",
"id": "wo_status",
"index": 2,
"isCellEditable": false,
"isCellVisible": true,
"isDerived": false,
"isDisabled": false,
"isEditable": false,
"isVisible": true,
"label": "wo_status",
"originalId": "wo_status",
"sticky": "",
"textSize": "0.775rem",
"validation": {},
"verticalAlignment": "CENTER",
"width": 150
},
"wo_duedate": {
"alias": "wo_duedate",
"allowCellWrapping": false,
"allowSameOptionsInNewRow": true,
"columnType": "text",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"wo_duedate\"])) : wo_duedate })()}}",
"enableFilter": true,
"enableSort": true,
"horizontalAlignment": "LEFT",
"id": "wo_duedate",
"index": 3,
"isCellEditable": false,
"isCellVisible": true,
"isDerived": false,
"isDisabled": false,
"isEditable": false,
"isVisible": true,
"label": "wo_duedate",
"originalId": "wo_duedate",
"sticky": "",
"textSize": "0.775rem",
"validation": {},
"verticalAlignment": "CENTER",
"width": 150
},
"customer_name": {
"alias": "customer_name",
"allowCellWrapping": false,
@@ -232,100 +175,134 @@
"verticalAlignment": "CENTER",
"width": 150
},
"wo_item": {
"alias": "wo_item",
"due_group": {
"alias": "due_group",
"allowCellWrapping": false,
"allowSameOptionsInNewRow": true,
"columnType": "text",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"wo_item\"])) : wo_item })()}}",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"due_group\"])) : due_group })()}}",
"enableFilter": true,
"enableSort": true,
"horizontalAlignment": "LEFT",
"id": "wo_item",
"index": 4,
"id": "due_group",
"index": 0,
"isCellEditable": false,
"isCellVisible": true,
"isDerived": false,
"isDisabled": false,
"isEditable": false,
"isVisible": true,
"label": "wo_item",
"originalId": "wo_item",
"label": "due_group",
"originalId": "due_group",
"sticky": "",
"textSize": "0.775rem",
"validation": {},
"verticalAlignment": "CENTER",
"width": 150
},
"wo_descrip": {
"alias": "wo_descrip",
"due_group_sort": {
"alias": "due_group_sort",
"allowCellWrapping": false,
"allowSameOptionsInNewRow": true,
"columnType": "text",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"wo_descrip\"])) : wo_descrip })()}}",
"cellBackground": "",
"columnType": "number",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"due_group_sort\"])) : due_group_sort })()}}",
"currencyCode": "USD",
"decimals": 0,
"enableFilter": true,
"enableSort": true,
"fontStyle": "",
"horizontalAlignment": "LEFT",
"id": "due_group_sort",
"index": 1,
"isCellEditable": false,
"isCellVisible": true,
"isDerived": false,
"isDisabled": false,
"isDiscardVisible": true,
"isEditable": false,
"isSaveVisible": true,
"isVisible": true,
"label": "due_group_sort",
"notation": "standard",
"originalId": "due_group_sort",
"sticky": "",
"textColor": "",
"textSize": "0.775rem",
"thousandSeparator": true,
"validation": {},
"verticalAlignment": "CENTER",
"width": 150
},
"qty_issued": {
"alias": "qty_issued",
"allowCellWrapping": false,
"allowSameOptionsInNewRow": true,
"columnType": "number",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"qty_issued\"])) : qty_issued })()}}",
"enableFilter": true,
"enableSort": true,
"horizontalAlignment": "LEFT",
"id": "wo_descrip",
"index": 5,
"id": "qty_issued",
"index": 11,
"isCellEditable": false,
"isCellVisible": true,
"isDerived": false,
"isDisabled": false,
"isEditable": false,
"isVisible": true,
"label": "wo_descrip",
"originalId": "wo_descrip",
"label": "qty_issued",
"originalId": "qty_issued",
"sticky": "",
"textSize": "0.775rem",
"validation": {},
"verticalAlignment": "CENTER",
"width": 150
},
"shortage_type": {
"alias": "shortage_type",
"qty_onhand": {
"alias": "qty_onhand",
"allowCellWrapping": false,
"allowSameOptionsInNewRow": true,
"columnType": "text",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"shortage_type\"])) : shortage_type })()}}",
"columnType": "number",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"qty_onhand\"])) : qty_onhand })()}}",
"enableFilter": true,
"enableSort": true,
"horizontalAlignment": "LEFT",
"id": "shortage_type",
"index": 6,
"id": "qty_onhand",
"index": 12,
"isCellEditable": false,
"isCellVisible": true,
"isDerived": false,
"isDisabled": false,
"isEditable": false,
"isVisible": true,
"label": "shortage_type",
"originalId": "shortage_type",
"label": "qty_onhand",
"originalId": "qty_onhand",
"sticky": "",
"textSize": "0.775rem",
"validation": {},
"verticalAlignment": "CENTER",
"width": 150
},
"sub_wo_num": {
"alias": "sub_wo_num",
"qty_required": {
"alias": "qty_required",
"allowCellWrapping": false,
"allowSameOptionsInNewRow": true,
"columnType": "text",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"sub_wo_num\"])) : sub_wo_num })()}}",
"columnType": "number",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"qty_required\"])) : qty_required })()}}",
"enableFilter": true,
"enableSort": true,
"horizontalAlignment": "LEFT",
"id": "sub_wo_num",
"index": 7,
"id": "qty_required",
"index": 10,
"isCellEditable": false,
"isCellVisible": true,
"isDerived": false,
"isDisabled": false,
"isEditable": false,
"isVisible": true,
"label": "sub_wo_num",
"originalId": "sub_wo_num",
"label": "qty_required",
"originalId": "qty_required",
"sticky": "",
"textSize": "0.775rem",
"validation": {},
@@ -382,75 +359,175 @@
"verticalAlignment": "CENTER",
"width": 150
},
"qty_required": {
"alias": "qty_required",
"shortage_type": {
"alias": "shortage_type",
"allowCellWrapping": false,
"allowSameOptionsInNewRow": true,
"columnType": "number",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"qty_required\"])) : qty_required })()}}",
"columnType": "text",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"shortage_type\"])) : shortage_type })()}}",
"enableFilter": true,
"enableSort": true,
"horizontalAlignment": "LEFT",
"id": "qty_required",
"index": 10,
"id": "shortage_type",
"index": 6,
"isCellEditable": false,
"isCellVisible": true,
"isDerived": false,
"isDisabled": false,
"isEditable": false,
"isVisible": true,
"label": "qty_required",
"originalId": "qty_required",
"label": "shortage_type",
"originalId": "shortage_type",
"sticky": "",
"textSize": "0.775rem",
"validation": {},
"verticalAlignment": "CENTER",
"width": 150
},
"qty_issued": {
"alias": "qty_issued",
"sub_wo_num": {
"alias": "sub_wo_num",
"allowCellWrapping": false,
"allowSameOptionsInNewRow": true,
"columnType": "number",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"qty_issued\"])) : qty_issued })()}}",
"columnType": "text",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"sub_wo_num\"])) : sub_wo_num })()}}",
"enableFilter": true,
"enableSort": true,
"horizontalAlignment": "LEFT",
"id": "qty_issued",
"index": 11,
"id": "sub_wo_num",
"index": 7,
"isCellEditable": false,
"isCellVisible": true,
"isDerived": false,
"isDisabled": false,
"isEditable": false,
"isVisible": true,
"label": "qty_issued",
"originalId": "qty_issued",
"label": "sub_wo_num",
"originalId": "sub_wo_num",
"sticky": "",
"textSize": "0.775rem",
"validation": {},
"verticalAlignment": "CENTER",
"width": 150
},
"qty_onhand": {
"alias": "qty_onhand",
"wo_descrip": {
"alias": "wo_descrip",
"allowCellWrapping": false,
"allowSameOptionsInNewRow": true,
"columnType": "number",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"qty_onhand\"])) : qty_onhand })()}}",
"columnType": "text",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"wo_descrip\"])) : wo_descrip })()}}",
"enableFilter": true,
"enableSort": true,
"horizontalAlignment": "LEFT",
"id": "qty_onhand",
"index": 12,
"id": "wo_descrip",
"index": 5,
"isCellEditable": false,
"isCellVisible": true,
"isDerived": false,
"isDisabled": false,
"isEditable": false,
"isVisible": true,
"label": "qty_onhand",
"originalId": "qty_onhand",
"label": "wo_descrip",
"originalId": "wo_descrip",
"sticky": "",
"textSize": "0.775rem",
"validation": {},
"verticalAlignment": "CENTER",
"width": 150
},
"wo_duedate": {
"alias": "wo_duedate",
"allowCellWrapping": false,
"allowSameOptionsInNewRow": true,
"columnType": "text",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"wo_duedate\"])) : wo_duedate })()}}",
"enableFilter": true,
"enableSort": true,
"horizontalAlignment": "LEFT",
"id": "wo_duedate",
"index": 3,
"isCellEditable": false,
"isCellVisible": true,
"isDerived": false,
"isDisabled": false,
"isEditable": false,
"isVisible": true,
"label": "wo_duedate",
"originalId": "wo_duedate",
"sticky": "",
"textSize": "0.775rem",
"validation": {},
"verticalAlignment": "CENTER",
"width": 150
},
"wo_item": {
"alias": "wo_item",
"allowCellWrapping": false,
"allowSameOptionsInNewRow": true,
"columnType": "text",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"wo_item\"])) : wo_item })()}}",
"enableFilter": true,
"enableSort": true,
"horizontalAlignment": "LEFT",
"id": "wo_item",
"index": 4,
"isCellEditable": false,
"isCellVisible": true,
"isDerived": false,
"isDisabled": false,
"isEditable": false,
"isVisible": true,
"label": "wo_item",
"originalId": "wo_item",
"sticky": "",
"textSize": "0.775rem",
"validation": {},
"verticalAlignment": "CENTER",
"width": 150
},
"wo_num": {
"alias": "wo_num",
"allowCellWrapping": false,
"allowSameOptionsInNewRow": true,
"columnType": "text",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"wo_num\"])) : wo_num })()}}",
"enableFilter": true,
"enableSort": true,
"horizontalAlignment": "LEFT",
"id": "wo_num",
"index": 1,
"isCellEditable": false,
"isCellVisible": true,
"isDerived": false,
"isDisabled": false,
"isEditable": false,
"isVisible": true,
"label": "wo_num",
"originalId": "wo_num",
"sticky": "",
"textSize": "0.775rem",
"validation": {},
"verticalAlignment": "CENTER",
"width": 150
},
"wo_status": {
"alias": "wo_status",
"allowCellWrapping": false,
"allowSameOptionsInNewRow": true,
"columnType": "text",
"computedValue": "{{(() => { const tableData = ws1tblshort.processedTableData || []; return tableData.length > 0 ? tableData.map((currentRow, currentIndex) => (currentRow[\"wo_status\"])) : wo_status })()}}",
"enableFilter": true,
"enableSort": true,
"horizontalAlignment": "LEFT",
"id": "wo_status",
"index": 2,
"isCellEditable": false,
"isCellVisible": true,
"isDerived": false,
"isDisabled": false,
"isEditable": false,
"isVisible": true,
"label": "wo_status",
"originalId": "wo_status",
"sticky": "",
"textSize": "0.775rem",
"validation": {},