修改出库报错的问题，升级poi，

src/main/java/com/jeeplus/modules/warehouse/ledger/dto/ExcelExportInfo.java

@@ -7,7 +7,7 @@ public class ExcelExportInfo {
     private String remarks;
     private int taskOrSend; // 0是收入，1是支出
     private String task;
-    private String mask;
+    private String send;
     private String num;
     private String model;
     private String userName;
@@ -60,12 +60,12 @@ public class ExcelExportInfo {
         this.task = task;
     }
 
-    public String getMask() {
-        return mask;
+    public String getSend() {
+        return send;
     }
 
-    public void setMask(String mask) {
-        this.mask = mask;
+    public void setSend(String send) {
+        this.send = send;
     }
 
     public String getNum() {

src/main/java/com/jeeplus/modules/warehouse/ledger/entity/Ledger.java

@@ -25,7 +25,6 @@ public class Ledger extends DataEntity<Ledger> {
 	private static final long serialVersionUID = 1L;
 	private String name;		// 物资名称
 	private MaterialType type;		// 类型
-	private String model;		// 型号
 	private String shelvesIds;		// 货架id集合
 	private Integer num;		// 数量
 	private BigDecimal sum; // 总价格
@@ -41,10 +40,9 @@ public class Ledger extends DataEntity<Ledger> {
 		super(id);
 	}
 
-	public Ledger(String name, MaterialType type, String model) {
+	public Ledger(String name, MaterialType type) {
 		this.name = name;
 		this.type = type;
-		this.model = model;
 	}
 
 	@NotNull(message="物资名称不能为空")
@@ -67,16 +65,6 @@ public class Ledger extends DataEntity<Ledger> {
 		this.type = type;
 	}
 
-	@NotNull(message="型号不能为空")
-	@ExcelField(title="型号", align=2, sort=3)
-	public String getModel() {
-		return model;
-	}
-
-	public void setModel(String model) {
-		this.model = model;
-	}
-
 	@ExcelField(title="货架id集合", align=2, sort=4)
 	public String getShelvesIds() {
 		return shelvesIds;

src/main/java/com/jeeplus/modules/warehouse/ledger/mapper/LedgerMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
 @MyBatisMapper
 public interface LedgerMapper extends BaseMapper<Ledger> {
 
-    public Ledger findByTypeAndModel(Ledger ledger);
+    public Ledger findByType(Ledger ledger);
     //zlt 查询台账主表的货架集合
     public List<String> findShelvesListByLedgerId(@Param("id") String id);
 }
\ No newline at end of file

src/main/java/com/jeeplus/modules/warehouse/ledger/mapper/xml/LedgerMapper.xml

@@ -6,7 +6,6 @@
 		a.id AS "id",
 		a.name AS "name",
 		a.type_id AS "type.id",
-		a.model AS "model",
 		a.shelvesids AS "shelvesIds",
 		a.num AS "num",
 		a.sum AS "sum",
@@ -103,7 +102,6 @@
 			id,
 			name,
 			type_id,
-			model,
 			shelvesids,
 			num,
 			sum,
@@ -117,7 +115,6 @@
 			#{id},
 			#{name},
 			#{type.id},
-			#{model},
 			#{shelvesIds},
 			#{num},
 			#{sum},
@@ -134,7 +131,6 @@
 		UPDATE t_wh_ledger SET 	
 			name = #{name},
 			type_id = #{type.id},
-			model = #{model},
 			shelvesids = #{shelvesIds},
 			num = #{num},
 			sum = #{sum},
@@ -164,7 +160,7 @@
 		select * FROM t_wh_ledger  where ${propertyName} = '${value}'
 	</select>
 
-	<select id="findByTypeAndModel" resultType="Ledger" >
+	<select id="findByType" resultType="Ledger" >
 		SELECT
 		<include refid="ledgerColumns"/>
 		FROM t_wh_ledger a
@@ -172,7 +168,6 @@
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			AND a.type_id = #{type.id}
-			AND a.model = #{model}
 		</where>
 	</select>
 	<select id="findShelvesListByLedgerId" resultType="java.lang.String" parameterType="java.lang.String">

src/main/java/com/jeeplus/modules/warehouse/outbound/mapper/xml/OutboundInfoMapper.xml

@@ -17,6 +17,7 @@
 		tpye.name AS "ledgerInfo.type.name",
 		ledgerInfo.model AS "ledgerInfo.model",
 		ledgerInfo.amount AS "ledgerInfo.amount",
+		ledgerInfo.batch_num AS "ledgerInfo.batchNum",
 		a.del_flag AS "delFlag"
 	</sql>
 	

src/main/java/com/jeeplus/modules/warehouse/profitwarehousing/service/ProfitWarehousingService.java

@@ -189,15 +189,15 @@ public class ProfitWarehousingService extends CrudService<ProfitWarehousingMappe
 	@Transactional(readOnly = false)
 	public void inLedgerInfo(ProfitWarehousingInfo profitWarehousingInfo) {
 		QrCode qrCode = qrCodeService.get(profitWarehousingInfo.getQrCode().getId());
-		Ledger ledger = new Ledger(profitWarehousingInfo.getName(),profitWarehousingInfo.getType(),profitWarehousingInfo.getMarking());
-		Ledger oldLeger = ledgerMapper.findByTypeAndModel(ledger);
+		Ledger ledger = new Ledger(profitWarehousingInfo.getName(),profitWarehousingInfo.getType());
+		Ledger oldLeger = ledgerMapper.findByType(ledger);
 		LedgerInfo ledgerInfo = new LedgerInfo();
 		//名称
 		ledgerInfo.setName(ledger.getName());
 		//类型
 		ledgerInfo.setType(ledger.getType());
 		//型号
-		ledgerInfo.setModel(ledger.getModel());
+		//ledgerInfo.setModel(ledger.getModel());
 		//物资编码
 		ledgerInfo.setCode(qrCode.getCode());
 		//二维码id

src/main/java/com/jeeplus/modules/warehouse/storage/entity/StorageInfo.java

@@ -33,7 +33,6 @@ public class StorageInfo extends DataEntity<StorageInfo> {
 	private String warehouseIds; // 仓库id集合
 	private BigDecimal amount; // 单价
 	private int num; // 数量
-	private BigDecimal infoSum; // 总价
 
 	private List<Shelves> shelvesList;		// 货架id
 	private List<Warehouse> warehouseList; // 仓库外键
@@ -164,13 +163,6 @@ public class StorageInfo extends DataEntity<StorageInfo> {
 		this.warehouseList = warehouseList;
 	}
 
-	public BigDecimal getInfoSum() {
-		return infoSum;
-	}
-
-	public void setInfoSum(BigDecimal infoSum) {
-		this.infoSum = infoSum;
-	}
 
 	public Date getBeginTime() {
 		return beginTime;