Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/warehouse/goods/web/GoodsController.java

@@ -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)
 	@RequestMapping(value = "form/{mode}")
 	public String form(@PathVariable String mode, Goods goods, Model model) {
-		String batchNum = CodeUtil.code("PC", StaticNumSeq.PC);
-		goods.setBatchNum(batchNum);
+		if (mode.equals("add")) {
+			String batchNum = CodeUtil.code("PC", StaticNumSeq.PC);
+			goods.setBatchNum(batchNum);
+		}
+
 		goods.setTime(new Date());
 		goods.setOperator(UserUtils.getUser());
 		model.addAttribute("goods", goods);

src/main/java/com/jeeplus/modules/warehouse/qrcode/util/DrawQrcodeUtil.java

@@ -252,7 +252,7 @@ public class DrawQrcodeUtil {
                 , RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
         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.setColor(qRcodeSize.color);//设置背景颜色
 //        g2.setBackground(c);

src/main/java/com/jeeplus/modules/warehouse/storage/web/StorageController.java

@@ -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)
 	@RequestMapping(value = "form/{mode}")
 	public String form(@PathVariable String mode, Storage storage, Model model) {
-		String code = CodeUtil.code("RKD", StaticNumSeq.RKD);
-		storage.setCode(code);
+		if (mode.equals("add")) {
+			String code = CodeUtil.code("RKD", StaticNumSeq.RKD);
+			storage.setCode(code);
+		}
+
 		storage.setTime(new Date());
 		storage.setOperator(UserUtils.getUser());
 		model.addAttribute("storage", storage);