Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
warehouse
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
胡懿
warehouse
Commits
629ad252
Commit
629ad252
authored
Jun 09, 2023
by
胡懿
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复货品和入库单预览和修改时,单号会发生变化的问题
parent
c1cc6289
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
+11
-5
GoodsController.java
.../jeeplus/modules/warehouse/goods/web/GoodsController.java
+5
-2
DrawQrcodeUtil.java
...jeeplus/modules/warehouse/qrcode/util/DrawQrcodeUtil.java
+1
-1
StorageController.java
...plus/modules/warehouse/storage/web/StorageController.java
+5
-2
No files found.
src/main/java/com/jeeplus/modules/warehouse/goods/web/GoodsController.java
View file @
629ad252
...
@@ -95,8 +95,11 @@ public class GoodsController extends BaseController {
...
@@ -95,8 +95,11 @@ public class GoodsController extends BaseController {
@RequiresPermissions
(
value
={
"warehouse:goods:goods:view"
,
"warehouse:goods:goods:add"
,
"warehouse:goods:goods:edit"
},
logical
=
Logical
.
OR
)
@RequiresPermissions
(
value
={
"warehouse:goods:goods:view"
,
"warehouse:goods:goods:add"
,
"warehouse:goods:goods:edit"
},
logical
=
Logical
.
OR
)
@RequestMapping
(
value
=
"form/{mode}"
)
@RequestMapping
(
value
=
"form/{mode}"
)
public
String
form
(
@PathVariable
String
mode
,
Goods
goods
,
Model
model
)
{
public
String
form
(
@PathVariable
String
mode
,
Goods
goods
,
Model
model
)
{
String
batchNum
=
CodeUtil
.
code
(
"PC"
,
StaticNumSeq
.
PC
);
if
(
mode
.
equals
(
"add"
))
{
goods
.
setBatchNum
(
batchNum
);
String
batchNum
=
CodeUtil
.
code
(
"PC"
,
StaticNumSeq
.
PC
);
goods
.
setBatchNum
(
batchNum
);
}
goods
.
setTime
(
new
Date
());
goods
.
setTime
(
new
Date
());
goods
.
setOperator
(
UserUtils
.
getUser
());
goods
.
setOperator
(
UserUtils
.
getUser
());
model
.
addAttribute
(
"goods"
,
goods
);
model
.
addAttribute
(
"goods"
,
goods
);
...
...
src/main/java/com/jeeplus/modules/warehouse/qrcode/util/DrawQrcodeUtil.java
View file @
629ad252
...
@@ -252,7 +252,7 @@ public class DrawQrcodeUtil {
...
@@ -252,7 +252,7 @@ public class DrawQrcodeUtil {
,
RenderingHints
.
VALUE_ALPHA_INTERPOLATION_QUALITY
);
,
RenderingHints
.
VALUE_ALPHA_INTERPOLATION_QUALITY
);
g2
.
setRenderingHints
(
rh
);
g2
.
setRenderingHints
(
rh
);
Font
font
=
new
Font
(
"黑体"
,
Font
.
BOLD
,
1
2
*
qRcodeSize
.
getInitfontSize
());
Font
font
=
new
Font
(
"黑体"
,
Font
.
BOLD
,
1
1
*
qRcodeSize
.
getInitfontSize
());
g2
.
setFont
(
font
);
//设置字体:字体、字号、大小
g2
.
setFont
(
font
);
//设置字体:字体、字号、大小
g2
.
setColor
(
qRcodeSize
.
color
);
//设置背景颜色
g2
.
setColor
(
qRcodeSize
.
color
);
//设置背景颜色
// g2.setBackground(c);
// g2.setBackground(c);
...
...
src/main/java/com/jeeplus/modules/warehouse/storage/web/StorageController.java
View file @
629ad252
...
@@ -97,8 +97,11 @@ public class StorageController extends BaseController {
...
@@ -97,8 +97,11 @@ public class StorageController extends BaseController {
@RequiresPermissions
(
value
={
"warehouse:storage:storage:view"
,
"warehouse:storage:storage:add"
,
"warehouse:storage:storage:edit"
},
logical
=
Logical
.
OR
)
@RequiresPermissions
(
value
={
"warehouse:storage:storage:view"
,
"warehouse:storage:storage:add"
,
"warehouse:storage:storage:edit"
},
logical
=
Logical
.
OR
)
@RequestMapping
(
value
=
"form/{mode}"
)
@RequestMapping
(
value
=
"form/{mode}"
)
public
String
form
(
@PathVariable
String
mode
,
Storage
storage
,
Model
model
)
{
public
String
form
(
@PathVariable
String
mode
,
Storage
storage
,
Model
model
)
{
String
code
=
CodeUtil
.
code
(
"RKD"
,
StaticNumSeq
.
RKD
);
if
(
mode
.
equals
(
"add"
))
{
storage
.
setCode
(
code
);
String
code
=
CodeUtil
.
code
(
"RKD"
,
StaticNumSeq
.
RKD
);
storage
.
setCode
(
code
);
}
storage
.
setTime
(
new
Date
());
storage
.
setTime
(
new
Date
());
storage
.
setOperator
(
UserUtils
.
getUser
());
storage
.
setOperator
(
UserUtils
.
getUser
());
model
.
addAttribute
(
"storage"
,
storage
);
model
.
addAttribute
(
"storage"
,
storage
);
...
...
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