Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
goods
Project
Project
Details
Activity
Releases
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
bp
goods
Commits
b9b7998f
Commit
b9b7998f
authored
Sep 13, 2021
by
孟维甫
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature_ota_manage' into 'test'
update:ota manage See merge request bp/goods!50
parents
85363ed9
2721c9fb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
OtaValidate.php
application/library/Validate/OtaValidate.php
+1
-1
FeiPrinter.php
vendor/api/php_services/src/Printer/Fei/FeiPrinter.php
+3
-0
No files found.
application/library/Validate/OtaValidate.php
View file @
b9b7998f
...
...
@@ -64,7 +64,7 @@ class OtaValidate extends \Validate\BaseValidate
}
p
rotected
function
is_label_printer_sn
(
$value
){
p
ublic
function
is_label_printer_sn
(
$value
){
if
(
substr
(
$value
,
3
,
1
)
!=
'2'
){
return
false
;
}
...
...
vendor/api/php_services/src/Printer/Fei/FeiPrinter.php
View file @
b9b7998f
...
...
@@ -108,6 +108,9 @@ class FeiPrinter extends \Api\PhpServices\Printer\Printer
if
(
is_array
(
$res
[
'response'
][
'data'
][
'ok'
])
&&
count
(
$res
[
'response'
][
'data'
][
'ok'
])
>
0
)
{
return
true
;
}
if
(
strpos
(
$res
[
'response'
][
'data'
][
'no'
][
0
],
'已被添加过'
))
{
return
true
;
}
throw
new
\Exception
(
$res
[
'response'
][
'data'
][
'no'
][
0
]);
}
throw
new
\Exception
(
$res
[
'response'
][
'msg'
]);
...
...
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