diff --git a/src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelBoxListData.java b/src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelBoxListData.java
index 5bbdf2d8..cd5edc5f 100644
--- a/src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelBoxListData.java
+++ b/src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelBoxListData.java
@@ -49,6 +49,11 @@ public class EcssCoDelBoxListData {
*/
private BigDecimal boxQty;
+ /**
+ * 体积/箱
+ */
+ private BigDecimal volume;
+
/**
* 创建人
*/
diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java
index a4bec7ce..061d952a 100644
--- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java
@@ -548,6 +548,12 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
grossWeight = parseBigDecimal(getMergedCellValue(sheet, r, grossWeightCol));
}
}
+ String volumePerBoxStr = null;
+ if (headerMap.containsKey("体积/箱")) {
+ volumePerBoxStr = getMergedCellValue(sheet, r, headerMap.get("体积/箱"));
+ } else if (headerMap.containsKey("体积/箱")) {
+ volumePerBoxStr = getMergedCellValue(sheet, r, headerMap.get("体积/箱"));
+ }
if (netWeightStr != null && !netWeightStr.isEmpty()) {
if (isFirstRowOfMergedRegion(sheet, r, headerMap.get("净重")) || !isMerged(sheet, r, headerMap.get("净重"))) {
@@ -568,6 +574,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
boxList.setItemNo(boxNo);
boxList.setNetWeight(parseBigDecimal(netWeightStr));
boxList.setGrossWeight(grossWeight);
+ boxList.setVolume(parseBigDecimal(volumePerBoxStr));
boxList.setCreateBy(data.getUsername());
boxList.setCreateDate(new Date());
boxList.setBoxQty(BigDecimal.ZERO);
diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml
index 0d87c4ca..c05e1654 100644
--- a/src/main/resources/mapper/ecss/CoDelMapper.xml
+++ b/src/main/resources/mapper/ecss/CoDelMapper.xml
@@ -524,8 +524,8 @@ create_by,create_date,update_by,update_date
- insert into ecss_CoDelBoxList(site,bu_no,delNo,seq_no,item_no,gross_weight,net_weight,box_qty,rolls,create_by,create_date)
- values (#{site},#{buNo},#{delNo},#{seqNo},#{itemNo},#{grossWeight,jdbcType=DECIMAL},#{netWeight,jdbcType=DECIMAL},#{boxQty},#{rolls,jdbcType=DECIMAL},#{createBy},GETDATE())
+ insert into ecss_CoDelBoxList(site,bu_no,delNo,seq_no,item_no,gross_weight,net_weight,box_qty,rolls,volume,create_by,create_date)
+ values (#{site},#{buNo},#{delNo},#{seqNo},#{itemNo},#{grossWeight,jdbcType=DECIMAL},#{netWeight,jdbcType=DECIMAL},#{boxQty},#{rolls,jdbcType=DECIMAL},#{volume,jdbcType=DECIMAL},#{createBy},GETDATE())