Commit 629ad252 by 胡懿

修复货品和入库单预览和修改时,单号会发生变化的问题

parent c1cc6289
...@@ -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);
......
...@@ -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,12 * qRcodeSize.getInitfontSize()); Font font = new Font("黑体",Font.BOLD,11 * qRcodeSize.getInitfontSize());
g2.setFont(font); //设置字体:字体、字号、大小 g2.setFont(font); //设置字体:字体、字号、大小
g2.setColor(qRcodeSize.color);//设置背景颜色 g2.setColor(qRcodeSize.color);//设置背景颜色
// g2.setBackground(c); // g2.setBackground(c);
......
...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment