Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
KGOrders
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Cam Hayes
KGOrders
Commits
a6836080
Commit
a6836080
authored
Jan 21, 2025
by
cam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set Status now works the same as the original program.
parent
1285e060
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
64 additions
and
38 deletions
+64
-38
View.AddOrder.dfm
kgOrdersClient/View.AddOrder.dfm
+18
-18
View.AddOrder.pas
kgOrdersClient/View.AddOrder.pas
+1
-1
View.OrderEntryCorrugated.pas
kgOrdersClient/View.OrderEntryCorrugated.pas
+1
-1
View.Orders.pas
kgOrdersClient/View.Orders.pas
+21
-9
Lookup.ServiceImpl.pas
kgOrdersServer/Source/Lookup.ServiceImpl.pas
+22
-8
kgOrdersServer.ini
kgOrdersServer/kgOrdersServer.ini
+1
-1
No files found.
kgOrdersClient/View.AddOrder.dfm
View file @
a6836080
...
@@ -3,8 +3,8 @@ object FAddOrder: TFAddOrder
...
@@ -3,8 +3,8 @@ object FAddOrder: TFAddOrder
Height = 477
Height = 477
OnShow = WebFormShow
OnShow = WebFormShow
object WebLabel1: TWebLabel
object WebLabel1: TWebLabel
Left = 33
0
Left = 33
4
Top =
78
Top =
56
Width = 35
Width = 35
Height = 15
Height = 15
Caption = 'Search'
Caption = 'Search'
...
@@ -12,8 +12,8 @@ object FAddOrder: TFAddOrder
...
@@ -12,8 +12,8 @@ object FAddOrder: TFAddOrder
WidthPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000
end
end
object WebLabel2: TWebLabel
object WebLabel2: TWebLabel
Left = 4
78
Left = 4
82
Top =
78
Top =
56
Width = 58
Width = 58
Height = 15
Height = 15
Caption = 'Selected ID'
Caption = 'Selected ID'
...
@@ -21,8 +21,8 @@ object FAddOrder: TFAddOrder
...
@@ -21,8 +21,8 @@ object FAddOrder: TFAddOrder
WidthPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000
end
end
object edtSearch: TWebEdit
object edtSearch: TWebEdit
Left = 33
0
Left = 33
4
Top =
104
Top =
82
Width = 121
Width = 121
Height = 22
Height = 22
HeightPercent = 100.000000000000000000
HeightPercent = 100.000000000000000000
...
@@ -30,8 +30,8 @@ object FAddOrder: TFAddOrder
...
@@ -30,8 +30,8 @@ object FAddOrder: TFAddOrder
OnChange = edtSearchChange
OnChange = edtSearchChange
end
end
object edtID: TWebEdit
object edtID: TWebEdit
Left = 4
78
Left = 4
82
Top =
104
Top =
82
Width = 69
Width = 69
Height = 22
Height = 22
ChildOrder = 1
ChildOrder = 1
...
@@ -196,8 +196,8 @@ object FAddOrder: TFAddOrder
...
@@ -196,8 +196,8 @@ object FAddOrder: TFAddOrder
DesignTimeSampleData = True
DesignTimeSampleData = True
end
end
object cbCorrugatedPlate: TWebCheckBox
object cbCorrugatedPlate: TWebCheckBox
Left =
0
Left =
4
Top =
105
Top =
83
Width = 113
Width = 113
Height = 22
Height = 22
Caption = 'Corrugated Plate'
Caption = 'Corrugated Plate'
...
@@ -207,8 +207,8 @@ object FAddOrder: TFAddOrder
...
@@ -207,8 +207,8 @@ object FAddOrder: TFAddOrder
OnClick = cbCorrugatedPlateClick
OnClick = cbCorrugatedPlateClick
end
end
object cbWebPlate: TWebCheckBox
object cbWebPlate: TWebCheckBox
Left = 12
4
Left = 12
8
Top =
105
Top =
83
Width = 83
Width = 83
Height = 22
Height = 22
Caption = 'Web Plate'
Caption = 'Web Plate'
...
@@ -218,8 +218,8 @@ object FAddOrder: TFAddOrder
...
@@ -218,8 +218,8 @@ object FAddOrder: TFAddOrder
OnClick = cbWebPlateClick
OnClick = cbWebPlateClick
end
end
object btnCancel: TWebButton
object btnCancel: TWebButton
Left = 6
76
Left = 6
80
Top =
103
Top =
81
Width = 96
Width = 96
Height = 25
Height = 25
Caption = 'Cancel'
Caption = 'Cancel'
...
@@ -229,8 +229,8 @@ object FAddOrder: TFAddOrder
...
@@ -229,8 +229,8 @@ object FAddOrder: TFAddOrder
OnClick = btnCancelClick
OnClick = btnCancelClick
end
end
object btnConfirm: TWebButton
object btnConfirm: TWebButton
Left = 56
0
Left = 56
4
Top =
103
Top =
81
Width = 96
Width = 96
Height = 25
Height = 25
Caption = 'Confirm'
Caption = 'Confirm'
...
@@ -240,8 +240,8 @@ object FAddOrder: TFAddOrder
...
@@ -240,8 +240,8 @@ object FAddOrder: TFAddOrder
OnClick = btnConfirmClick
OnClick = btnConfirmClick
end
end
object cbCuttingDie: TWebCheckBox
object cbCuttingDie: TWebCheckBox
Left = 2
27
Left = 2
31
Top =
105
Top =
83
Width = 83
Width = 83
Height = 22
Height = 22
Caption = 'Cutting Die'
Caption = 'Cutting Die'
...
...
kgOrdersClient/View.AddOrder.pas
View file @
a6836080
...
@@ -66,7 +66,7 @@ end;
...
@@ -66,7 +66,7 @@ end;
procedure
TFAddOrder
.
btnConfirmClick
(
Sender
:
TObject
);
procedure
TFAddOrder
.
btnConfirmClick
(
Sender
:
TObject
);
begin
begin
if
(
(
not
cbCorrugatedPlate
.
Checked
)
or
(
not
cbWebPlate
.
Checked
)
or
(
not
cbCuttingDie
.
Checked
)
)
then
if
(
(
not
cbCorrugatedPlate
.
Checked
)
and
(
not
cbWebPlate
.
Checked
)
and
(
not
cbCuttingDie
.
Checked
)
)
then
edtNotification
.
Text
:=
'Please Select an Order Type'
edtNotification
.
Text
:=
'Please Select an Order Type'
else
if
edtID
.
Text
=
''
then
else
if
edtID
.
Text
=
''
then
edtNotification
.
Text
:=
'Please Select a Customer'
edtNotification
.
Text
:=
'Please Select a Customer'
...
...
kgOrdersClient/View.OrderEntryCorrugated.pas
View file @
a6836080
...
@@ -360,7 +360,7 @@ begin
...
@@ -360,7 +360,7 @@ begin
if
mode
=
'EDIT'
then
if
mode
=
'EDIT'
then
orderJSON
.
AddPair
(
'ORDER_ID'
,
orderID
);
orderJSON
.
AddPair
(
'ORDER_ID'
,
orderID
);
AddCorrugatedOrder
(
orderJSON
);
AddCorrugatedOrder
(
orderJSON
);
FViewMain
.
ViewOrders
(
'Success'
);
FViewMain
.
ViewOrders
(
'Success
:Order Successfully Added
'
);
end
;
end
;
procedure
TFOrderEntryCorrugated
.
AddCorrugatedOrder
(
orderJSON
:
TJSONObject
);
procedure
TFOrderEntryCorrugated
.
AddCorrugatedOrder
(
orderJSON
:
TJSONObject
);
...
...
kgOrdersClient/View.Orders.pas
View file @
a6836080
...
@@ -83,7 +83,7 @@ type
...
@@ -83,7 +83,7 @@ type
procedure
ShowSetStatusForm
();
procedure
ShowSetStatusForm
();
[
async
]
procedure
GetOrders
(
searchOptions
:
string
);
[
async
]
procedure
GetOrders
(
searchOptions
:
string
);
[
async
]
procedure
GenerateReportPDF
;
[
async
]
procedure
GenerateReportPDF
;
[
async
]
procedure
SetStatus
(
ORDER_ID
,
date
,
status
:
string
);
[
async
]
procedure
SetStatus
(
statusInfo
:
string
);
var
var
PageNumber
:
integer
;
PageNumber
:
integer
;
PageSize
:
integer
;
PageSize
:
integer
;
...
@@ -309,10 +309,8 @@ procedure TFViewOrders.ShowSetStatusForm();
...
@@ -309,10 +309,8 @@ procedure TFViewOrders.ShowSetStatusForm();
// displays the search pop-up that allows the user to filter the order list
// displays the search pop-up that allows the user to filter the order list
var
var
newform
:
TFSetStatus
;
newform
:
TFSetStatus
;
statusInfo
:
TJSONObject
;
begin
begin
newform
:=
TFSetStatus
.
CreateNew
;
newform
:=
TFSetStatus
.
CreateNew
;
statusInfo
:=
TJSONObject
.
Create
;
newform
.
Caption
:=
'Input Search Options'
;
newform
.
Caption
:=
'Input Search Options'
;
newForm
.
Popup
:=
True
;
newForm
.
Popup
:=
True
;
...
@@ -331,23 +329,37 @@ begin
...
@@ -331,23 +329,37 @@ begin
procedure
(
AValue
:
TModalResult
)
procedure
(
AValue
:
TModalResult
)
var
var
searchOptions
:
string
;
searchOptions
:
string
;
StatusJSON
:
TJSONObject
;
begin
begin
if
newform
.
confirm
then
if
newform
.
confirm
then
begin
begin
SetStatus
(
OrderID
,
DateTimeToStr
(
newform
.
dtpDate
.
Date
),
newform
.
wlcbStatus
.
Value
);
StatusJSON
:=
TJSONObject
.
Create
;
getOrders
(
searchOptions
);
StatusJSON
.
AddPair
(
'ORDER_ID'
,
OrderID
);
StatusJSON
.
AddPair
(
'date'
,
DateTimeToStr
(
newform
.
dtpDate
.
Date
));
StatusJSON
.
AddPair
(
'status'
,
newform
.
wlcbStatus
.
Value
);
StatusJSON
.
AddPair
(
'USER_ID'
,
1011
);
StatusJSON
.
AddPair
(
'mode'
,
'EDIT'
);
StatusJSON
.
AddPair
(
'staff_fields_ship_date'
,
DateToStr
(
newForm
.
dtpNewShipDue
.
Date
));
StatusJSON
.
AddPair
(
'staff_fields_mount_due'
,
DateToStr
(
newForm
.
dtpNewMountDue
.
Date
));
StatusJSON
.
AddPair
(
'staff_fields_plate_due'
,
DateToStr
(
newForm
.
dtpNewPlateDue
.
Date
));
StatusJSON
.
AddPair
(
'staff_fields_art_due'
,
DateToStr
(
newForm
.
dtpNewArtDue
.
Date
));
console
.
log
(
StatusJSON
);
SetStatus
(
StatusJSON
.
ToString
);
OrderID
:=
''
;
getOrders
(
GenerateSearchOptions
());
end
;
end
;
end
end
);
);
end
;
end
;
procedure
TFViewOrders
.
SetStatus
(
ORDER_ID
,
date
,
status
:
string
);
procedure
TFViewOrders
.
SetStatus
(
statusInfo
:
string
);
var
var
xdcResponse
:
TXDataClientResponse
;
xdcResponse
:
TXDataClientResponse
;
statusOptions
:
string
;
statusOptions
:
string
;
begin
begin
statusOptions
:=
'&ORDER_ID='
+
ORDER_ID
+
'&date='
+
date
+
'&status='
+
status
+
'&USER_ID=1011'
;
xdcResponse
:=
await
(
XDataWebClient1
.
RawInvokeAsync
(
'ILookupService.SetStatus'
,
[
statusInfo
]));
xdcResponse
:=
await
(
XDataWebClient1
.
RawInvokeAsync
(
'ILookupService.SetStatus'
,
[
statusOptions
]));
end
;
end
;
...
@@ -710,7 +722,7 @@ begin
...
@@ -710,7 +722,7 @@ begin
if
orderID
<>
''
then
if
orderID
<>
''
then
searchOptions
:=
searchOptions
+
'&orderID='
+
orderID
;
searchOptions
:=
searchOptions
+
'&orderID='
+
orderID
;
console
.
log
(
searchOptions
);
Result
:=
searchOptions
;
Result
:=
searchOptions
;
end
;
end
;
...
...
kgOrdersServer/Source/Lookup.ServiceImpl.pas
View file @
a6836080
...
@@ -1005,26 +1005,30 @@ end;
...
@@ -1005,26 +1005,30 @@ end;
function
TLookupService
.
SetStatus
(
statusOptions
:
string
):
string
;
function
TLookupService
.
SetStatus
(
statusOptions
:
string
):
string
;
var
var
params
:
TStringList
;
params
:
TStringList
;
OrderID
:
string
;
StatusInfo
:
TJSONObject
;
ORDER_ID
:
integer
;
Date
:
String
;
Date
:
String
;
Status
:
string
;
Status
:
string
;
UserID
:
string
;
UserID
:
string
;
SQL
:
string
;
SQL
:
string
;
temp
:
string
;
begin
begin
try
logger
.
Log
(
1
,
'Set Status Hit'
);
logger
.
Log
(
1
,
'Set Status Hit'
);
StatusInfo
:=
TJSONObject
.
ParseJSONValue
(
statusOptions
)
as
TJSONObject
;
params
:=
TStringList
.
Create
;
params
:=
TStringList
.
Create
;
// parse the statusOptions
// parse the statusOptions
params
.
Delimiter
:=
'&'
;
params
.
Delimiter
:=
'&'
;
params
.
StrictDelimiter
:=
true
;
params
.
StrictDelimiter
:=
true
;
params
.
DelimitedText
:=
statusOptions
;
params
.
DelimitedText
:=
statusOptions
;
OrderID
:=
params
.
Values
[
'ORDER_ID'
]
;
ORDER_ID
:=
StatusInfo
.
GetValue
<
integer
>(
'ORDER_ID'
)
;
Date
:=
params
.
Values
[
'date'
]
;
Date
:=
StatusInfo
.
GetValue
<
string
>(
'date'
)
;
Status
:=
params
.
Values
[
'status'
]
;
Status
:=
StatusInfo
.
GetValue
<
string
>(
'status'
)
;
UserID
:=
params
.
Values
[
'USER_ID'
]
;
UserID
:=
StatusInfo
.
GetValue
<
string
>(
'USER_ID'
)
;
SQL
:=
'select * from orders_status where ORDER_ID = '
+
OrderID
+
' AND '
+
SQL
:=
'select * from orders_status where ORDER_ID = '
+
IntToStr
(
ORDER_ID
)
+
' AND '
+
'ORDER_STATUS = '
+
quotedStr
(
Status
);
'ORDER_STATUS = '
+
quotedStr
(
Status
);
try
logger
.
Log
(
1
,
'Trying to Set Status'
);
logger
.
Log
(
1
,
'Trying to Set Status'
);
doQuery
(
ordersDB
.
UniQuery1
,
SQL
);
doQuery
(
ordersDB
.
UniQuery1
,
SQL
);
...
@@ -1032,7 +1036,7 @@ begin
...
@@ -1032,7 +1036,7 @@ begin
// Add Status
// Add Status
begin
begin
ordersDB
.
UniQuery1
.
Insert
;
ordersDB
.
UniQuery1
.
Insert
;
ordersDB
.
UniQuery1
.
FieldByName
(
'ORDER_ID'
).
AsString
:=
OrderID
;
ordersDB
.
UniQuery1
.
FieldByName
(
'ORDER_ID'
).
AsString
:=
IntToStr
(
ORDER_ID
)
;
ordersDB
.
UniQuery1
.
FieldByName
(
'ORDER_STATUS'
).
AsString
:=
Status
;
ordersDB
.
UniQuery1
.
FieldByName
(
'ORDER_STATUS'
).
AsString
:=
Status
;
ordersDB
.
UniQuery1
.
FieldByName
(
'STATUS_DATE'
).
AsDateTime
:=
StrToDateTime
(
Date
);
ordersDB
.
UniQuery1
.
FieldByName
(
'STATUS_DATE'
).
AsDateTime
:=
StrToDateTime
(
Date
);
ordersDB
.
UniQuery1
.
FieldByName
(
'STATUS_TIMESTAMP'
).
AsDateTime
:=
Now
;
ordersDB
.
UniQuery1
.
FieldByName
(
'STATUS_TIMESTAMP'
).
AsDateTime
:=
Now
;
...
@@ -1049,6 +1053,16 @@ begin
...
@@ -1049,6 +1053,16 @@ begin
end
;
end
;
ordersDB
.
UniQuery1
.
Post
;
ordersDB
.
UniQuery1
.
Post
;
if
StatusInfo
.
GetValue
<
string
>(
'staff_fields_ship_date'
)
<>
'12/30/1899'
then
AddStatusSchedule
(
'SHIP'
,
StatusInfo
,
ORDER_ID
);
if
StatusInfo
.
GetValue
<
string
>(
'staff_fields_art_due'
)
<>
'12/30/1899'
then
AddStatusSchedule
(
'ART'
,
StatusInfo
,
ORDER_ID
);
if
StatusInfo
.
GetValue
<
string
>(
'staff_fields_plate_due'
)
<>
'12/30/1899'
then
AddStatusSchedule
(
'PLATE'
,
StatusInfo
,
ORDER_ID
);
if
StatusInfo
.
GetValue
<
string
>(
'staff_fields_mount_due'
)
<>
'12/30/1899'
then
AddStatusSchedule
(
'MOUNT'
,
StatusInfo
,
ORDER_ID
);
logger
.
Log
(
1
,
'Status Successfully set'
);
logger
.
Log
(
1
,
'Status Successfully set'
);
result
:=
'success'
;
result
:=
'success'
;
except
except
...
...
kgOrdersServer/kgOrdersServer.ini
View file @
a6836080
[Settings]
[Settings]
MemoLogLevel
=
4
MemoLogLevel
=
4
FileLogLevel
=
5
FileLogLevel
=
5
LogFileNum
=
1
11
LogFileNum
=
1
23
webClientVersion
=
1.0.0
webClientVersion
=
1.0.0
[Database]
[Database]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment