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 cd4369b4..9c21033a 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 @@ -68,4 +68,6 @@ public class EcssCoDelBoxListData { * 更新时间 */ private Date updateDate; + + private BigDecimal rolls; } diff --git a/src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelPalletHeader.java b/src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelPalletHeader.java index 56262cc8..598d6c16 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelPalletHeader.java +++ b/src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelPalletHeader.java @@ -100,4 +100,6 @@ public class EcssCoDelPalletHeader { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateDate; + private BigDecimal rolls; + } diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java index 25713ed7..351b29db 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java @@ -2006,6 +2006,7 @@ public class CoDelServiceImpl implements CoDelService { boxListData.setNetWeight(inData.getNetWeight()); boxListData.setBoxQty(inData.getBoxQty()); boxListData.setCreateBy(currentUser.getUsername()); + boxListData.setRolls(inData.getRolls()); coDelMapper.saveCodelBoxList(boxListData); for (EcssCoDelNotifyDetailData detailData : notifys) { EcssCoDelPalletDetailData palletDetailData = new EcssCoDelPalletDetailData(); @@ -4537,6 +4538,10 @@ public class CoDelServiceImpl implements CoDelService { boxChange.put("netWeight_old", oldBox.get("netWeight")); boxChange.put("netWeight_new", box.get("netWeight")); } + if (box.containsKey("rolls")) { + boxChange.put("rolls_old", oldBox.get("rolls")); + boxChange.put("rolls_new", box.get("rolls")); + } } boxChanges.add(boxChange); @@ -4550,6 +4555,7 @@ public class CoDelServiceImpl implements CoDelService { updateParams.put("box_qty", box.get("box_qty")); updateParams.put("grossWeight", box.get("grossWeight")); updateParams.put("netWeight", box.get("netWeight")); + updateParams.put("rolls", box.get("rolls")); updateParams.put("updateBy", updateBy); coDelMapper.updateBoxInfo(updateParams); @@ -4599,7 +4605,7 @@ public class CoDelServiceImpl implements CoDelService { detailData.setPn((String) detail.get("pn")); detailData.setQty(detail.get("qty") != null ? new BigDecimal(detail.get("qty").toString()) : null); detailData.setOldQty(oldQty); - detailData.setRolls(detail.get("rolls") != null ? new BigDecimal(detail.get("rolls").toString()) : null); + detailData.setRolls(detail.get("rolls") != null&&StringUtils.isNotEmpty(detail.get("rolls").toString()) ? new BigDecimal(detail.get("rolls").toString()) : null); detailData.setUpdateBy(updateBy); // 执行更新 @@ -4722,7 +4728,7 @@ public class CoDelServiceImpl implements CoDelService { if (boxChanges != null && !boxChanges.isEmpty()) { emailContent.append("
📋 箱信息修改(共 ").append(boxChanges.size()).append(" 条)
"); emailContent.append(""); - emailContent.append(""); + emailContent.append(""); for (Map change : boxChanges) { emailContent.append(""); @@ -4761,6 +4767,17 @@ public class CoDelServiceImpl implements CoDelService { } emailContent.append(""); + // 总Rolls + emailContent.append(""); + emailContent.append(""); } emailContent.append("
序号箱数毛重净重
序号箱数毛重净重总Rolls
"); + if (change.containsKey("rolls_old") && change.containsKey("rolls_new")) { + emailContent.append("").append(change.get("rolls_old")).append(""); + emailContent.append(""); + emailContent.append("").append(change.get("rolls_new")).append(""); + } else { + emailContent.append("-"); + } + emailContent.append("
"); diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml index 76e059d6..006500bc 100644 --- a/src/main/resources/mapper/ecss/CoDelMapper.xml +++ b/src/main/resources/mapper/ecss/CoDelMapper.xml @@ -465,8 +465,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,create_by,create_date) - values (#{site},#{buNo},#{delNo},#{seqNo},#{itemNo},#{grossWeight,jdbcType=DECIMAL},#{netWeight,jdbcType=DECIMAL},#{boxQty},#{createBy},GETDATE()) + 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()) @@ -1251,7 +1251,8 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no update ecss_CoDelBoxList set box_qty = #{box_qty}, gross_weight = #{grossWeight}, - net_weight = #{netWeight} + net_weight = #{netWeight}, + rolls = #{rolls} where site = #{site} and bu_no = #{buNo} and delNo = #{delNo}