Compare commits
2 Commits
dev
...
928e7296b1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
928e7296b1 | ||
|
|
7d22c23dfe |
@@ -84,9 +84,6 @@ class BoxingPage extends StatefulWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
|
class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
|
||||||
static const _androidKeyCodeButtonR1 = 103;
|
|
||||||
static const _androidKeyCodeButtonL2 = 104;
|
|
||||||
|
|
||||||
final _scannerService = ScannerService();
|
final _scannerService = ScannerService();
|
||||||
final _apiService = ApiService();
|
final _apiService = ApiService();
|
||||||
final _feedbackService = FeedbackService();
|
final _feedbackService = FeedbackService();
|
||||||
@@ -145,6 +142,9 @@ class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
|
|||||||
bool _isAutoProcessing = false;
|
bool _isAutoProcessing = false;
|
||||||
final _autoWarnings = <String>[];
|
final _autoWarnings = <String>[];
|
||||||
|
|
||||||
|
// 多码凑箱:已完成装箱时可跳转的箱号
|
||||||
|
int? _completedJumpBoxNo;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
@@ -201,28 +201,23 @@ class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
|
|||||||
_finishManyToOneBox();
|
_finishManyToOneBox();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (_completedJumpBoxNo != null && _isJumpToBoxKey(event)) {
|
||||||
|
_jumpToCompletedBox();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool _isModeSwitchKey(KeyEvent event) {
|
bool _isModeSwitchKey(KeyEvent event) {
|
||||||
final key = event.logicalKey;
|
final key = event.logicalKey;
|
||||||
return key == LogicalKeyboardKey.select ||
|
return key == LogicalKeyboardKey.select ||
|
||||||
key == LogicalKeyboardKey.gameButtonRight1 ||
|
key == LogicalKeyboardKey.gameButtonRight1;
|
||||||
_androidKeyCodeFromLogicalKey(key) == _androidKeyCodeButtonR1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool _isFinishBoxKey(KeyEvent event) {
|
bool _isFinishBoxKey(KeyEvent event) {
|
||||||
final key = event.logicalKey;
|
return event.logicalKey == LogicalKeyboardKey.gameButtonLeft2;
|
||||||
return key == LogicalKeyboardKey.gameButtonLeft2 ||
|
|
||||||
_androidKeyCodeFromLogicalKey(key) == _androidKeyCodeButtonL2;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int? _androidKeyCodeFromLogicalKey(LogicalKeyboardKey key) {
|
bool _isJumpToBoxKey(KeyEvent event) {
|
||||||
final keyId = key.keyId;
|
return event.logicalKey == LogicalKeyboardKey.gameButtonRight2;
|
||||||
const androidPlane = LogicalKeyboardKey.androidPlane;
|
|
||||||
if (keyId >= androidPlane && keyId < androidPlane + 0x100000000) {
|
|
||||||
return keyId - androidPlane;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void _onBoxNoTextChanged() {
|
void _onBoxNoTextChanged() {
|
||||||
@@ -372,6 +367,7 @@ class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
|
|||||||
_editingAssignedItemId = null;
|
_editingAssignedItemId = null;
|
||||||
_editingAssignedQuantity = '';
|
_editingAssignedQuantity = '';
|
||||||
_deletingAssignedItemId = null;
|
_deletingAssignedItemId = null;
|
||||||
|
_completedJumpBoxNo = null;
|
||||||
_statusOverrideText = null;
|
_statusOverrideText = null;
|
||||||
if (_mode == BoxingMode.singleCode) {
|
if (_mode == BoxingMode.singleCode) {
|
||||||
_paichanSwitchNotice = null;
|
_paichanSwitchNotice = null;
|
||||||
@@ -482,6 +478,10 @@ class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
|
|||||||
final remaining = _remainingQuantity;
|
final remaining = _remainingQuantity;
|
||||||
if (remaining <= 0) {
|
if (remaining <= 0) {
|
||||||
_quantityController.clear();
|
_quantityController.clear();
|
||||||
|
if (_manyToOnePackedItems.isEmpty &&
|
||||||
|
_currentZongpaiBoxes.isNotEmpty) {
|
||||||
|
_completedJumpBoxNo = _currentZongpaiBoxes.first.boxNo;
|
||||||
|
}
|
||||||
_statusOverrideText = '该总排号已全部装箱完毕';
|
_statusOverrideText = '该总排号已全部装箱完毕';
|
||||||
_statusOverrideDot = StatusDotColor.red;
|
_statusOverrideDot = StatusDotColor.red;
|
||||||
return;
|
return;
|
||||||
@@ -1230,6 +1230,17 @@ class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _jumpToCompletedBox() {
|
||||||
|
final boxNo = _completedJumpBoxNo;
|
||||||
|
if (boxNo == null) return;
|
||||||
|
setState(() {
|
||||||
|
_boxNoController.text = boxNo.toString();
|
||||||
|
_completedJumpBoxNo = null;
|
||||||
|
_statusOverrideText = null;
|
||||||
|
_statusOverrideDot = null;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// === 导航到详情页 ===
|
// === 导航到详情页 ===
|
||||||
|
|
||||||
void _openDetail() {
|
void _openDetail() {
|
||||||
@@ -1430,15 +1441,32 @@ class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
|
|||||||
if (_phase == _Phase.scanned &&
|
if (_phase == _Phase.scanned &&
|
||||||
_zongpaiNo != null &&
|
_zongpaiNo != null &&
|
||||||
_remainingQuantity <= 0) {
|
_remainingQuantity <= 0) {
|
||||||
banners.add(
|
final jumpBoxNo = _completedJumpBoxNo;
|
||||||
_noticeBanner(
|
if (jumpBoxNo != null) {
|
||||||
icon: Icon(Icons.warning, size: 14, color: Colors.red.shade800),
|
banners.add(
|
||||||
text: '${_zongpaiNo!} 已全部装箱完毕,无需操作',
|
GestureDetector(
|
||||||
background: Colors.red.shade50,
|
onTap: _jumpToCompletedBox,
|
||||||
foreground: Colors.red.shade800,
|
behavior: HitTestBehavior.opaque,
|
||||||
border: Colors.red.shade100,
|
child: _noticeBanner(
|
||||||
),
|
icon: Icon(Icons.warning, size: 14, color: Colors.amber.shade800),
|
||||||
);
|
text: '${_zongpaiNo!} 已完成装箱。(P4跳转所在箱号)',
|
||||||
|
background: Colors.amber.shade50,
|
||||||
|
foreground: Colors.amber.shade800,
|
||||||
|
border: Colors.amber.shade200,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
banners.add(
|
||||||
|
_noticeBanner(
|
||||||
|
icon: Icon(Icons.warning, size: 14, color: Colors.red.shade800),
|
||||||
|
text: '${_zongpaiNo!} 已全部装箱完毕,无需操作',
|
||||||
|
background: Colors.red.shade50,
|
||||||
|
foreground: Colors.red.shade800,
|
||||||
|
border: Colors.red.shade100,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return banners;
|
return banners;
|
||||||
}
|
}
|
||||||
@@ -1684,31 +1712,23 @@ class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
|
|||||||
|
|
||||||
Widget _buildSingleAssignedHeader(int count) {
|
Widget _buildSingleAssignedHeader(int count) {
|
||||||
return Container(
|
return Container(
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 7),
|
height: 28,
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: Colors.white,
|
color: Colors.grey.shade200,
|
||||||
border: Border(bottom: BorderSide(color: Colors.grey.shade300)),
|
border: Border(bottom: BorderSide(color: Colors.grey.shade400)),
|
||||||
),
|
),
|
||||||
child: Row(
|
child: Row(
|
||||||
children: [
|
children: [
|
||||||
|
const Expanded(flex: 22, child: Text('箱号', style: _headerStyle)),
|
||||||
|
const Expanded(flex: 24, child: Text('工令号', style: _headerStyle)),
|
||||||
const Expanded(
|
const Expanded(
|
||||||
child: Text(
|
flex: 14,
|
||||||
'已分配(此总排号)',
|
child: Text('数量', textAlign: TextAlign.center, style: _headerStyle),
|
||||||
style: TextStyle(
|
|
||||||
fontSize: 11,
|
|
||||||
fontWeight: FontWeight.w700,
|
|
||||||
color: Colors.black54,
|
|
||||||
letterSpacing: 0.5,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
Text(
|
const SizedBox(
|
||||||
'$count 条',
|
width: 64,
|
||||||
style: TextStyle(
|
child: Text('操作', textAlign: TextAlign.center, style: _headerStyle),
|
||||||
fontSize: 11,
|
|
||||||
fontWeight: FontWeight.w700,
|
|
||||||
color: Theme.of(context).colorScheme.primary,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
@@ -1722,142 +1742,148 @@ class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
|
|||||||
? Colors.amber
|
? Colors.amber
|
||||||
: (deleting ? Colors.red : Colors.green);
|
: (deleting ? Colors.red : Colors.green);
|
||||||
|
|
||||||
|
final Color bgColor;
|
||||||
|
if (editing) {
|
||||||
|
bgColor = Colors.yellow.shade50;
|
||||||
|
} else if (deleting) {
|
||||||
|
bgColor = Colors.red.shade50;
|
||||||
|
} else {
|
||||||
|
bgColor = Colors.transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
final rowStyle = TextStyle(
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: FontWeight.w500,
|
||||||
|
color: Colors.black87,
|
||||||
|
);
|
||||||
|
|
||||||
return Column(
|
return Column(
|
||||||
children: [
|
children: [
|
||||||
Container(
|
Container(
|
||||||
height: 40,
|
constraints: const BoxConstraints(minHeight: 36),
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: editing
|
color: bgColor,
|
||||||
? Colors.yellow.shade50
|
border: Border(
|
||||||
: (deleting ? Colors.red.shade50 : null),
|
left: BorderSide(color: barColor, width: 3),
|
||||||
border: Border(bottom: BorderSide(color: Colors.grey.shade200)),
|
bottom: BorderSide(color: Colors.grey.shade200),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
child: Row(
|
child: Row(
|
||||||
children: [
|
children: [
|
||||||
SizedBox(
|
|
||||||
width: 14,
|
|
||||||
child: Text(
|
|
||||||
'$index',
|
|
||||||
textAlign: TextAlign.right,
|
|
||||||
style: TextStyle(
|
|
||||||
fontSize: 10,
|
|
||||||
fontWeight: FontWeight.w600,
|
|
||||||
color: Colors.grey.shade500,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(width: 6),
|
|
||||||
Container(
|
|
||||||
width: 3,
|
|
||||||
height: 22,
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: barColor,
|
|
||||||
borderRadius: BorderRadius.circular(2),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(width: 6),
|
|
||||||
Expanded(
|
Expanded(
|
||||||
child: Column(
|
flex: 22,
|
||||||
|
child: Text(
|
||||||
|
'${item.boxNo} 号箱',
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: rowStyle.copyWith(fontWeight: FontWeight.w700),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
flex: 24,
|
||||||
|
child: Text(
|
||||||
|
_workOrderNo ?? '--',
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: rowStyle,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
flex: 14,
|
||||||
|
child: editing
|
||||||
|
? SizedBox(
|
||||||
|
width: 52,
|
||||||
|
height: 28,
|
||||||
|
child: TextField(
|
||||||
|
keyboardType: TextInputType.none,
|
||||||
|
inputFormatters: [
|
||||||
|
FilteringTextInputFormatter.digitsOnly,
|
||||||
|
],
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
controller: TextEditingController(
|
||||||
|
text: _editingAssignedQuantity,
|
||||||
|
)..selection = TextSelection.collapsed(
|
||||||
|
offset: _editingAssignedQuantity.length,
|
||||||
|
),
|
||||||
|
onChanged: (v) => _editingAssignedQuantity = v,
|
||||||
|
onSubmitted: (_) => _saveAssignedItem(item),
|
||||||
|
decoration: InputDecoration(
|
||||||
|
contentPadding: const EdgeInsets.symmetric(
|
||||||
|
horizontal: 4,
|
||||||
|
),
|
||||||
|
border: OutlineInputBorder(
|
||||||
|
borderRadius: BorderRadius.circular(5),
|
||||||
|
borderSide: const BorderSide(
|
||||||
|
color: Colors.amber,
|
||||||
|
width: 1.5,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
style: const TextStyle(
|
||||||
|
fontSize: 14,
|
||||||
|
fontWeight: FontWeight.w700,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: Text(
|
||||||
|
'${item.quantity} 件',
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: deleting ? Colors.red : Colors.black54,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
width: 64,
|
||||||
|
child: Row(
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
children: [
|
||||||
Text(
|
if (editing) ...[
|
||||||
'${item.boxNo} 号箱',
|
_iconBtn(
|
||||||
style: const TextStyle(
|
Icons.check,
|
||||||
fontSize: 13,
|
color: Colors.green,
|
||||||
fontWeight: FontWeight.w700,
|
onTap: _isSubmitting
|
||||||
|
? null
|
||||||
|
: () => _saveAssignedItem(item),
|
||||||
),
|
),
|
||||||
overflow: TextOverflow.ellipsis,
|
_iconBtn(
|
||||||
),
|
Icons.close,
|
||||||
Text(
|
color: Colors.grey,
|
||||||
_workOrderNo ?? '--',
|
onTap: _isSubmitting ? null : _cancelEditAssigned,
|
||||||
style: TextStyle(
|
|
||||||
fontSize: 10,
|
|
||||||
color: Colors.grey.shade500,
|
|
||||||
),
|
),
|
||||||
),
|
] else ...[
|
||||||
|
_iconBtn(
|
||||||
|
Icons.edit,
|
||||||
|
color: Colors.grey.shade700,
|
||||||
|
onTap: _isSubmitting
|
||||||
|
? null
|
||||||
|
: () => _startEditAssigned(item),
|
||||||
|
),
|
||||||
|
_iconBtn(
|
||||||
|
Icons.delete_outline,
|
||||||
|
color: Colors.red,
|
||||||
|
onTap: _isSubmitting
|
||||||
|
? null
|
||||||
|
: () {
|
||||||
|
setState(() {
|
||||||
|
_deletingAssignedItemId = item.boxItemId;
|
||||||
|
_editingAssignedItemId = null;
|
||||||
|
_editingAssignedQuantity = '';
|
||||||
|
});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
if (editing)
|
|
||||||
SizedBox(
|
|
||||||
width: 52,
|
|
||||||
height: 28,
|
|
||||||
child: TextField(
|
|
||||||
keyboardType: TextInputType.none,
|
|
||||||
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
|
|
||||||
textAlign: TextAlign.center,
|
|
||||||
controller:
|
|
||||||
TextEditingController(text: _editingAssignedQuantity)
|
|
||||||
..selection = TextSelection.collapsed(
|
|
||||||
offset: _editingAssignedQuantity.length,
|
|
||||||
),
|
|
||||||
onChanged: (value) => _editingAssignedQuantity = value,
|
|
||||||
onSubmitted: (_) => _saveAssignedItem(item),
|
|
||||||
decoration: InputDecoration(
|
|
||||||
contentPadding: const EdgeInsets.symmetric(horizontal: 4),
|
|
||||||
border: OutlineInputBorder(
|
|
||||||
borderRadius: BorderRadius.circular(5),
|
|
||||||
borderSide: const BorderSide(
|
|
||||||
color: Colors.amber,
|
|
||||||
width: 1.5,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
style: const TextStyle(
|
|
||||||
fontSize: 14,
|
|
||||||
fontWeight: FontWeight.w700,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
else
|
|
||||||
Text(
|
|
||||||
'${item.quantity} 件',
|
|
||||||
style: TextStyle(
|
|
||||||
fontSize: 13,
|
|
||||||
fontWeight: FontWeight.w600,
|
|
||||||
color: deleting ? Colors.red : Colors.black54,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
if (editing) ...[
|
|
||||||
_iconBtn(
|
|
||||||
Icons.check,
|
|
||||||
color: Colors.green,
|
|
||||||
onTap: _isSubmitting ? null : () => _saveAssignedItem(item),
|
|
||||||
),
|
|
||||||
_iconBtn(
|
|
||||||
Icons.close,
|
|
||||||
color: Colors.grey,
|
|
||||||
onTap: _isSubmitting ? null : _cancelEditAssigned,
|
|
||||||
),
|
|
||||||
] else ...[
|
|
||||||
_iconBtn(
|
|
||||||
Icons.edit,
|
|
||||||
color: Colors.grey.shade700,
|
|
||||||
onTap: _isSubmitting ? null : () => _startEditAssigned(item),
|
|
||||||
),
|
|
||||||
_iconBtn(
|
|
||||||
Icons.delete_outline,
|
|
||||||
color: Colors.red,
|
|
||||||
onTap: _isSubmitting
|
|
||||||
? null
|
|
||||||
: () {
|
|
||||||
setState(() {
|
|
||||||
_deletingAssignedItemId = item.boxItemId;
|
|
||||||
_editingAssignedItemId = null;
|
|
||||||
_editingAssignedQuantity = '';
|
|
||||||
});
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
if (deleting)
|
if (deleting)
|
||||||
Container(
|
Container(
|
||||||
height: 28,
|
height: 28,
|
||||||
padding: const EdgeInsets.only(left: 34, right: 12),
|
padding: const EdgeInsets.only(left: 15, right: 12),
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: Colors.red.shade50,
|
color: Colors.red.shade50,
|
||||||
border: Border(bottom: BorderSide(color: Colors.red.shade200)),
|
border: Border(bottom: BorderSide(color: Colors.red.shade200)),
|
||||||
@@ -2237,31 +2263,23 @@ class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
|
|||||||
|
|
||||||
Widget _buildManyToOneListHeader(int count) {
|
Widget _buildManyToOneListHeader(int count) {
|
||||||
return Container(
|
return Container(
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 7),
|
height: 28,
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: Colors.white,
|
color: Colors.grey.shade200,
|
||||||
border: Border(bottom: BorderSide(color: Colors.grey.shade300)),
|
border: Border(bottom: BorderSide(color: Colors.grey.shade400)),
|
||||||
),
|
),
|
||||||
child: Row(
|
child: Row(
|
||||||
children: [
|
children: [
|
||||||
|
const Expanded(flex: 22, child: Text('总排号', style: _headerStyle)),
|
||||||
|
const Expanded(flex: 24, child: Text('工令号', style: _headerStyle)),
|
||||||
const Expanded(
|
const Expanded(
|
||||||
child: Text(
|
flex: 14,
|
||||||
'已装入本箱',
|
child: Text('数量', textAlign: TextAlign.center, style: _headerStyle),
|
||||||
style: TextStyle(
|
|
||||||
fontSize: 11,
|
|
||||||
fontWeight: FontWeight.w700,
|
|
||||||
color: Colors.black54,
|
|
||||||
letterSpacing: 0.5,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
Text(
|
const SizedBox(
|
||||||
'$count 项',
|
width: 64,
|
||||||
style: TextStyle(
|
child: Text('操作', textAlign: TextAlign.center, style: _headerStyle),
|
||||||
fontSize: 11,
|
|
||||||
fontWeight: FontWeight.w700,
|
|
||||||
color: Theme.of(context).colorScheme.primary,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
@@ -2279,164 +2297,157 @@ class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
|
|||||||
? Colors.amber
|
? Colors.amber
|
||||||
: (deleting ? Colors.red : Colors.green);
|
: (deleting ? Colors.red : Colors.green);
|
||||||
|
|
||||||
|
final Color bgColor;
|
||||||
|
if (editing) {
|
||||||
|
bgColor = Colors.yellow.shade50;
|
||||||
|
} else if (deleting) {
|
||||||
|
bgColor = Colors.red.shade50;
|
||||||
|
} else {
|
||||||
|
bgColor = Colors.transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
final rowStyle = TextStyle(
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: FontWeight.w500,
|
||||||
|
color: Colors.black87,
|
||||||
|
);
|
||||||
|
|
||||||
return Column(
|
return Column(
|
||||||
children: [
|
children: [
|
||||||
Container(
|
Container(
|
||||||
height: 40,
|
constraints: const BoxConstraints(minHeight: 36),
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: editing
|
color: bgColor,
|
||||||
? Colors.yellow.shade50
|
border: Border(
|
||||||
: (deleting ? Colors.red.shade50 : null),
|
left: BorderSide(color: barColor, width: 3),
|
||||||
border: Border(bottom: BorderSide(color: Colors.grey.shade200)),
|
bottom: BorderSide(color: Colors.grey.shade200),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
child: Row(
|
child: Row(
|
||||||
children: [
|
children: [
|
||||||
// Index
|
|
||||||
SizedBox(
|
|
||||||
width: 14,
|
|
||||||
child: Text(
|
|
||||||
'$index',
|
|
||||||
textAlign: TextAlign.right,
|
|
||||||
style: TextStyle(
|
|
||||||
fontSize: 10,
|
|
||||||
fontWeight: FontWeight.w600,
|
|
||||||
color: Colors.grey.shade500,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(width: 6),
|
|
||||||
// Color bar
|
|
||||||
Container(
|
|
||||||
width: 3,
|
|
||||||
height: 26,
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: barColor,
|
|
||||||
borderRadius: BorderRadius.circular(2),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(width: 6),
|
|
||||||
// Main info
|
|
||||||
Expanded(
|
Expanded(
|
||||||
child: Column(
|
flex: 22,
|
||||||
|
child: Text(
|
||||||
|
item.zongpaiNo,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: rowStyle.copyWith(fontWeight: FontWeight.w700),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
flex: 24,
|
||||||
|
child: Text(
|
||||||
|
item.workOrderNo ?? '--',
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: rowStyle,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
flex: 14,
|
||||||
|
child: editing
|
||||||
|
? SizedBox(
|
||||||
|
width: 52,
|
||||||
|
height: 26,
|
||||||
|
child: TextField(
|
||||||
|
keyboardType: TextInputType.none,
|
||||||
|
inputFormatters: [
|
||||||
|
FilteringTextInputFormatter.digitsOnly,
|
||||||
|
],
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
controller: TextEditingController(
|
||||||
|
text: _editingPackedQuantity,
|
||||||
|
)..selection = TextSelection.collapsed(
|
||||||
|
offset: _editingPackedQuantity.length,
|
||||||
|
),
|
||||||
|
onChanged: (v) => _editingPackedQuantity = v,
|
||||||
|
decoration: InputDecoration(
|
||||||
|
contentPadding: const EdgeInsets.symmetric(
|
||||||
|
horizontal: 4,
|
||||||
|
),
|
||||||
|
border: OutlineInputBorder(
|
||||||
|
borderRadius: BorderRadius.circular(4),
|
||||||
|
borderSide: const BorderSide(
|
||||||
|
color: Colors.amber,
|
||||||
|
width: 1.5,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
style: const TextStyle(
|
||||||
|
fontSize: 13,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: Text(
|
||||||
|
'${item.quantity} / $totalText',
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: deleting ? Colors.red : Colors.green.shade700,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
width: 64,
|
||||||
|
child: Row(
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
children: [
|
||||||
Text(
|
if (editing) ...[
|
||||||
item.zongpaiNo,
|
_iconBtn(
|
||||||
style: const TextStyle(
|
Icons.check,
|
||||||
fontSize: 12,
|
color: Colors.green,
|
||||||
fontWeight: FontWeight.w700,
|
onTap: _isSubmitting
|
||||||
|
? null
|
||||||
|
: () => _savePackedItem(item),
|
||||||
),
|
),
|
||||||
overflow: TextOverflow.ellipsis,
|
_iconBtn(
|
||||||
),
|
Icons.close,
|
||||||
Text(
|
color: Colors.grey,
|
||||||
item.workOrderNo ?? '--',
|
onTap: _isSubmitting ? null : _cancelEditPackedItem,
|
||||||
style: TextStyle(
|
|
||||||
fontSize: 11,
|
|
||||||
color: Colors.grey.shade500,
|
|
||||||
),
|
),
|
||||||
overflow: TextOverflow.ellipsis,
|
] else ...[
|
||||||
),
|
_iconBtn(
|
||||||
|
Icons.edit,
|
||||||
|
color: Colors.grey.shade700,
|
||||||
|
onTap: _isSubmitting
|
||||||
|
? null
|
||||||
|
: () => _startEditPackedItem(item),
|
||||||
|
),
|
||||||
|
_iconBtn(
|
||||||
|
Icons.delete_outline,
|
||||||
|
color: Colors.red,
|
||||||
|
onTap: _isSubmitting
|
||||||
|
? null
|
||||||
|
: () {
|
||||||
|
setState(() {
|
||||||
|
_deletingPackedItemId = item.boxItemId;
|
||||||
|
_editingPackedItemId = null;
|
||||||
|
_editingPackedQuantity = '';
|
||||||
|
});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
// Quantity / edit input
|
|
||||||
if (editing)
|
|
||||||
SizedBox(
|
|
||||||
width: 52,
|
|
||||||
height: 26,
|
|
||||||
child: TextField(
|
|
||||||
keyboardType: TextInputType.none,
|
|
||||||
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
|
|
||||||
textAlign: TextAlign.center,
|
|
||||||
controller:
|
|
||||||
TextEditingController(text: _editingPackedQuantity)
|
|
||||||
..selection = TextSelection.collapsed(
|
|
||||||
offset: _editingPackedQuantity.length,
|
|
||||||
),
|
|
||||||
onChanged: (value) => _editingPackedQuantity = value,
|
|
||||||
decoration: InputDecoration(
|
|
||||||
contentPadding: const EdgeInsets.symmetric(horizontal: 4),
|
|
||||||
border: OutlineInputBorder(
|
|
||||||
borderRadius: BorderRadius.circular(4),
|
|
||||||
borderSide: const BorderSide(
|
|
||||||
color: Colors.amber,
|
|
||||||
width: 1.5,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
style: const TextStyle(
|
|
||||||
fontSize: 13,
|
|
||||||
fontWeight: FontWeight.w600,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
else
|
|
||||||
Text(
|
|
||||||
'${item.quantity} / $totalText',
|
|
||||||
style: TextStyle(
|
|
||||||
fontSize: 12,
|
|
||||||
fontWeight: FontWeight.w600,
|
|
||||||
color: deleting ? Colors.red : Colors.green.shade700,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
// Action buttons
|
|
||||||
if (editing) ...[
|
|
||||||
_iconBtn(
|
|
||||||
Icons.check,
|
|
||||||
color: Colors.green,
|
|
||||||
onTap: _isSubmitting ? null : () => _savePackedItem(item),
|
|
||||||
),
|
|
||||||
_iconBtn(
|
|
||||||
Icons.close,
|
|
||||||
color: Colors.grey,
|
|
||||||
onTap: _isSubmitting ? null : _cancelEditPackedItem,
|
|
||||||
),
|
|
||||||
] else ...[
|
|
||||||
_iconBtn(
|
|
||||||
Icons.edit,
|
|
||||||
color: Colors.orange.shade700,
|
|
||||||
onTap: _isSubmitting
|
|
||||||
? null
|
|
||||||
: () => _startEditPackedItem(item),
|
|
||||||
),
|
|
||||||
_iconBtn(
|
|
||||||
Icons.delete_outline,
|
|
||||||
color: Colors.red,
|
|
||||||
onTap: _isSubmitting
|
|
||||||
? null
|
|
||||||
: () {
|
|
||||||
setState(() {
|
|
||||||
_deletingPackedItemId = item.boxItemId;
|
|
||||||
_editingPackedItemId = null;
|
|
||||||
_editingPackedQuantity = '';
|
|
||||||
});
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
// Inline delete confirmation
|
|
||||||
if (deleting)
|
if (deleting)
|
||||||
Container(
|
Container(
|
||||||
padding: const EdgeInsets.only(
|
height: 28,
|
||||||
left: 34,
|
padding: const EdgeInsets.only(left: 15, right: 12),
|
||||||
right: 12,
|
|
||||||
top: 2,
|
|
||||||
bottom: 5,
|
|
||||||
),
|
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: Colors.red.shade50,
|
color: Colors.red.shade50,
|
||||||
border: Border(bottom: BorderSide(color: Colors.red.shade200)),
|
border: Border(bottom: BorderSide(color: Colors.red.shade200)),
|
||||||
),
|
),
|
||||||
child: Row(
|
child: Row(
|
||||||
children: [
|
children: [
|
||||||
const Expanded(
|
Expanded(
|
||||||
child: Text(
|
child: Text(
|
||||||
'确认删除?',
|
'确认删除?',
|
||||||
style: TextStyle(
|
style: const TextStyle(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
color: Colors.red,
|
color: Colors.red,
|
||||||
fontWeight: FontWeight.w500,
|
fontWeight: FontWeight.w500,
|
||||||
@@ -2735,3 +2746,5 @@ class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const _headerStyle = TextStyle(fontSize: 10, fontWeight: FontWeight.w700);
|
||||||
|
|||||||
@@ -39,10 +39,6 @@ class HomePage extends StatefulWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class _HomePageState extends State<HomePage> {
|
class _HomePageState extends State<HomePage> {
|
||||||
static const _androidKeyCode1 = 8;
|
|
||||||
static const _androidKeyCode2 = 9;
|
|
||||||
static const _androidKeyCode3 = 10;
|
|
||||||
|
|
||||||
final _apiService = ApiService();
|
final _apiService = ApiService();
|
||||||
final _focusNode = FocusNode();
|
final _focusNode = FocusNode();
|
||||||
bool _isCheckingConnection = false;
|
bool _isCheckingConnection = false;
|
||||||
@@ -134,23 +130,6 @@ class _HomePageState extends State<HomePage> {
|
|||||||
event.character == '3') {
|
event.character == '3') {
|
||||||
return 3;
|
return 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Android keyCode fallback for scanner devices: 1/2/3 => 8/9/10.
|
|
||||||
final androidKeyCode = _androidKeyCodeFromLogicalKey(key);
|
|
||||||
return switch (androidKeyCode) {
|
|
||||||
_androidKeyCode1 => 1,
|
|
||||||
_androidKeyCode2 => 2,
|
|
||||||
_androidKeyCode3 => 3,
|
|
||||||
_ => null,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
int? _androidKeyCodeFromLogicalKey(LogicalKeyboardKey key) {
|
|
||||||
final keyId = key.keyId;
|
|
||||||
const androidPlane = LogicalKeyboardKey.androidPlane;
|
|
||||||
if (keyId >= androidPlane && keyId < androidPlane + 0x100000000) {
|
|
||||||
return keyId - androidPlane;
|
|
||||||
}
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,8 +20,6 @@ class RegistrationPage extends StatefulWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class _RegistrationPageState extends State<RegistrationPage> {
|
class _RegistrationPageState extends State<RegistrationPage> {
|
||||||
static const _androidKeyCodeButtonR1 = 103;
|
|
||||||
|
|
||||||
final _scannerService = ScannerService();
|
final _scannerService = ScannerService();
|
||||||
final _apiService = ApiService();
|
final _apiService = ApiService();
|
||||||
final _feedbackService = FeedbackService();
|
final _feedbackService = FeedbackService();
|
||||||
@@ -101,17 +99,7 @@ class _RegistrationPageState extends State<RegistrationPage> {
|
|||||||
bool _isLockToggleKey(KeyEvent event) {
|
bool _isLockToggleKey(KeyEvent event) {
|
||||||
final key = event.logicalKey;
|
final key = event.logicalKey;
|
||||||
return key == LogicalKeyboardKey.select ||
|
return key == LogicalKeyboardKey.select ||
|
||||||
key == LogicalKeyboardKey.gameButtonRight1 ||
|
key == LogicalKeyboardKey.gameButtonRight1;
|
||||||
_androidKeyCodeFromLogicalKey(key) == _androidKeyCodeButtonR1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int? _androidKeyCodeFromLogicalKey(LogicalKeyboardKey key) {
|
|
||||||
final keyId = key.keyId;
|
|
||||||
const androidPlane = LogicalKeyboardKey.androidPlane;
|
|
||||||
if (keyId >= androidPlane && keyId < androidPlane + 0x100000000) {
|
|
||||||
return keyId - androidPlane;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void _onScan(ScanResult result) {
|
void _onScan(ScanResult result) {
|
||||||
@@ -676,13 +664,9 @@ class _RegistrationPageState extends State<RegistrationPage> {
|
|||||||
focusNode: dialogFocus,
|
focusNode: dialogFocus,
|
||||||
onKeyEvent: (event) {
|
onKeyEvent: (event) {
|
||||||
if (event is! KeyDownEvent) return;
|
if (event is! KeyDownEvent) return;
|
||||||
final androidKey =
|
if (event.logicalKey == LogicalKeyboardKey.arrowUp) {
|
||||||
_androidKeyCodeFromLogicalKey(event.logicalKey);
|
|
||||||
if (event.logicalKey == LogicalKeyboardKey.arrowUp ||
|
|
||||||
androidKey == 19) {
|
|
||||||
setDialogState(() => selectedIndex = 0);
|
setDialogState(() => selectedIndex = 0);
|
||||||
} else if (event.logicalKey == LogicalKeyboardKey.arrowDown ||
|
} else if (event.logicalKey == LogicalKeyboardKey.arrowDown) {
|
||||||
androidKey == 20) {
|
|
||||||
setDialogState(() => selectedIndex = 1);
|
setDialogState(() => selectedIndex = 1);
|
||||||
} else if (event.logicalKey == LogicalKeyboardKey.enter) {
|
} else if (event.logicalKey == LogicalKeyboardKey.enter) {
|
||||||
selectedIndex == 0 ? dismissAsNo() : confirmSwitch();
|
selectedIndex == 0 ? dismissAsNo() : confirmSwitch();
|
||||||
|
|||||||
Reference in New Issue
Block a user