修改入库表单代码逻辑

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

@@ -95,10 +95,10 @@ 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) {
-		if (mode.equals("add")) {
+		/*if (mode.equals("add")) {
 			String batchNum = CodeUtil.code("PC", StaticNumSeq.PC);
 			goods.setBatchNum(batchNum);
-		}
+		}*/
 
 		goods.setTime(new Date());
 		goods.setOperator(UserUtils.getUser());

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

@@ -21,6 +21,7 @@ import java.io.*;
 import java.text.AttributedString;
 import java.text.SimpleDateFormat;
 import java.util.Iterator;
+import java.util.Locale;
 
 public class DrawQrcodeUtil {
     /**
@@ -253,7 +254,8 @@ public class DrawQrcodeUtil {
                 , RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
         g2.setRenderingHints(rh);
 
-        Font font = new Font("黑体",Font.BOLD,14 * qRcodeSize.getInitfontSize());
+        Font font = new Font("微软雅黑",Font.PLAIN,150);
+
         g2.setFont(font); //设置字体:字体、字号、大小
         g2.setColor(qRcodeSize.color);//设置背景颜色
 //        g2.setBackground(c);

src/main/java/com/jeeplus/modules/warehouse/shelves/utils/ShelvesUtil.java

@@ -69,7 +69,7 @@ public class ShelvesUtil {
                         tem.setDelFlag("0");
                         List<Shelves> list =  shelvesMapper.findList(tem);
                         for (Shelves s : list) {
-                            CacheUtils.put(SHELCES_CACHE, SHELCES_ID + s.getId());
+                            CacheUtils.put(SHELCES_CACHE, SHELCES_ID + s.getId(), s);
                         }
                         shelves = (Shelves) CacheUtils.get(SHELCES_CACHE, SHELCES_ID + id);
                         resultList.add(shelves);
@@ -99,7 +99,7 @@ public class ShelvesUtil {
                         tem.setDelFlag("0");
                         List<Warehouse> list =  warehouseMapper.findList(tem);
                         for (Warehouse w : list) {
-                            CacheUtils.put(WAREHOUSE_CACHE, WAREHOUSE_ID + w.getId());
+                            CacheUtils.put(WAREHOUSE_CACHE, WAREHOUSE_ID + w.getId(), w);
                         }
                         warehouse = (Warehouse) CacheUtils.get(WAREHOUSE_CACHE, WAREHOUSE_ID + id);
                         resultList.add(warehouse);

src/main/java/com/jeeplus/modules/warehouse/storage/mapper/xml/StorageInfoMapper.xml

@@ -23,6 +23,8 @@
 
 		type.name AS "type.name",
 		type.code AS "type.code",
+		type.amount AS "type.amount",
+		type.unit AS "type.unit",
 
 		qr.code AS "qrCode.code",
 		qr.state AS "qrCode.state"
@@ -122,6 +124,7 @@
 			warehouse_id,
 			qr_id,
 			amount,
+			num,
 			remarks,
 			create_by,
 			create_date,
@@ -139,6 +142,7 @@
 			#{warehouseIds},
 			#{qrCode.id},
 			#{amount},
+			#{num},
 			#{remarks},
 			#{createBy.id},
 			#{createDate},
@@ -158,6 +162,7 @@
 			shelves_id = #{shelvesIds},
 			warehouse_id = #{warehouseIds},
 			amount = #{amount},
+			num = #{num},
 			remarks = #{remarks},
 			update_by = #{updateBy.id},
 			update_date = #{updateDate}