wilson
/
xujie-sys
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

箱序号天线支持varchar

ecss-tx
han\hanst 4 weeks ago
parent
61e3c811f6
commit
1498f6ff31
5 changed files with 21 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelBoxListData.java
  2. 2
      src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelPalletDetail.java
  3. 8
      src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java
  4. 4
      src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java
  5. 26
      src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java

2
src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelBoxListData.java
View File

@ -32,7 +32,7 @@ public class EcssCoDelBoxListData {
/**
* 项次
*/
private Integer itemNo;
private String itemNo;
/**
* 毛重

2
src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelPalletDetail.java
View File

@ -27,7 +27,7 @@ public class EcssCoDelPalletDetail {
/**
*
*/
private Integer seqNo;
private String seqNo;
/**
*

8
src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java
View File

@ -51,10 +51,10 @@ public interface CoDelMapper {
void updateEcssDelHeader(EcssCoDelNotifyHeaderData data);
void updateEcssDelHeaderForModify(EcssCoDelNotifyHeaderData data);
// 专门更新客户信息
void updateCustomerInfo(EcssCoDelNotifyHeaderData data);
void deleteEcssDelHeader(EcssCoDelNotifyHeaderData data);
void changeEcssDelStatus(EcssCoDelNotifyHeaderData data);
@ -134,7 +134,7 @@ public interface CoDelMapper {
void deletePalletHeader(EcssCoDelPalletHeaderData inData);
void deleteBoxList(EcssCoDelPalletHeaderData inData);
void deletePalletDetail(@Param("site") String site,@Param("buNo") String buNo,@Param("delNo") String delNo,
@Param("seqNo") Integer seqNo,@Param("itemNo") Integer itemNo);
@Param("seqNo") String seqNo,@Param("itemNo") Integer itemNo);
EcssCoDelPalletHeader getAllWeight( @Param("site") String site,@Param("delNo") String delNo,
@ -298,7 +298,7 @@ public interface CoDelMapper {
// 获取最大的template_no（用于生成新的template_no）
@Select("SELECT TOP 1 template_no FROM ecss_Customer_template ORDER BY template_no DESC")
String getMaxTemplateNo();
// 根据客户名称获取客户编码
@Select("SELECT TOP 1 ccuscode FROM ecss_custdev_mes_cmc_customer WHERE ccusname = #{customerName}")
String getCustomerCodeByName(@Param("customerName") String customerName);

4
src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java
View File

@ -1642,7 +1642,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
boxListData.setSite(inData.getSite());
boxListData.setBuNo(inData.getBuNo());
boxListData.setDelNo(inData.getDelNo());
boxListData.setItemNo(seqNo);
boxListData.setItemNo(seqNo+"");
// 箱数：取第一条记录的箱数（同一箱内所有明细的箱数都相同）
BigDecimal boxQty = entry.getValue().get(0).getBoxQty();
@ -1675,7 +1675,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
detailData.setSite(thisData.getSite());
detailData.setBuNo(thisData.getBuNo());
detailData.setDelNo(thisData.getDelNo());
detailData.setSeqNo(seqNo); // 箱号
detailData.setSeqNo(seqNo+""); // 箱号
detailData.setItemNo(itemNo); // 箱内明细行号
detailData.setNotifyDetailItemNo(thisData.getNotifyDetailItemNo()); // 对应的发货通知单明细序号
detailData.setPartNo(thisData.getPartNo());

26
src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java
View File

@ -655,7 +655,7 @@ public class CoDelServiceImpl implements CoDelService {
boxListData.setSite(inData.getSite());
boxListData.setBuNo(inData.getBuNo());
boxListData.setDelNo(inData.getDelNo());
boxListData.setItemNo(seqNo);
boxListData.setItemNo(seqNo+"");
boxListData.setGrossWeight(inData.getGrossWeight());
boxListData.setNetWeight(inData.getNetWeight());
boxListData.setBoxQty(inData.getBoxQty());
@ -665,7 +665,7 @@ public class CoDelServiceImpl implements CoDelService {
for (EcssCoDelNotifyDetailData detailData : notifys) {
EcssCoDelPalletDetailData palletDetailData = new EcssCoDelPalletDetailData();
palletDetailData.setDelNo(inData.getDelNo());
palletDetailData.setSeqNo(seqNo);
palletDetailData.setSeqNo(seqNo+"");
palletDetailData.setPartNo(detailData.getPartNo());
palletDetailData.setBuNo(detailData.getBuNo());
palletDetailData.setSite(inData.getSite());
@ -1188,7 +1188,7 @@ public class CoDelServiceImpl implements CoDelService {
boxListData.setSite(inData.getSite());
boxListData.setBuNo(inData.getBuNo());
boxListData.setDelNo(inData.getDelNo());
boxListData.setItemNo(seqNo);
boxListData.setItemNo(seqNo+"");
// 根据实际箱数计算毛重和净重
BigDecimal boxGrossWeight = wholeBoxes.multiply(boxWeight);
BigDecimal boxNetWeight = boxGrossWeight.subtract(wholeBoxes.divide(BigDecimal.valueOf(2)));
@ -1201,7 +1201,7 @@ public class CoDelServiceImpl implements CoDelService {
EcssCoDelPalletDetailData wholeBoxData = new EcssCoDelPalletDetailData();
wholeBoxData.setDelNo(inData.getDelNo());
wholeBoxData.setSeqNo(seqNo);
wholeBoxData.setSeqNo(seqNo+"");
wholeBoxData.setPartNo(detailData.getPartNo());
wholeBoxData.setBuNo(detailData.getBuNo());
wholeBoxData.setSite(inData.getSite());
@ -1225,7 +1225,7 @@ public class CoDelServiceImpl implements CoDelService {
boxListData.setSite(inData.getSite());
boxListData.setBuNo(inData.getBuNo());
boxListData.setDelNo(inData.getDelNo());
boxListData.setItemNo(seqNo);
boxListData.setItemNo(seqNo+"");
// 零数箱按1箱计算毛重和净重
BigDecimal boxGrossWeight = BigDecimal.ONE.multiply(boxWeight);
BigDecimal boxNetWeight = boxGrossWeight.subtract(BigDecimal.ONE.divide(BigDecimal.valueOf(2)));
@ -1238,7 +1238,7 @@ public class CoDelServiceImpl implements CoDelService {
EcssCoDelPalletDetailData remainderBoxData = new EcssCoDelPalletDetailData();
remainderBoxData.setDelNo(inData.getDelNo());
remainderBoxData.setSeqNo(seqNo);
remainderBoxData.setSeqNo(seqNo+"");
remainderBoxData.setPartNo(detailData.getPartNo());
remainderBoxData.setBuNo(detailData.getBuNo());
remainderBoxData.setSite(inData.getSite());
@ -1263,7 +1263,7 @@ public class CoDelServiceImpl implements CoDelService {
boxListData.setSite(inData.getSite());
boxListData.setBuNo(inData.getBuNo());
boxListData.setDelNo(inData.getDelNo());
boxListData.setItemNo(seqNo);
boxListData.setItemNo(seqNo+"");
// 根据实际箱数计算毛重和净重
BigDecimal boxGrossWeight = actualBoxQty.multiply(boxWeight);
BigDecimal boxNetWeight = boxGrossWeight.subtract(actualBoxQty.divide(BigDecimal.valueOf(2)));
@ -1276,7 +1276,7 @@ public class CoDelServiceImpl implements CoDelService {
EcssCoDelPalletDetailData palletDetailData = new EcssCoDelPalletDetailData();
palletDetailData.setDelNo(inData.getDelNo());
palletDetailData.setSeqNo(seqNo);
palletDetailData.setSeqNo(seqNo+"");
palletDetailData.setPartNo(detailData.getPartNo());
palletDetailData.setBuNo(detailData.getBuNo());
palletDetailData.setSite(inData.getSite());
@ -1698,7 +1698,7 @@ public class CoDelServiceImpl implements CoDelService {
}
// 删除箱明细
coDelMapper.deletePalletDetail(site, buNo, delNo, Integer.parseInt(itemNo), null);
coDelMapper.deletePalletDetail(site, buNo, delNo, itemNo, null);
// 删除箱信息
Map<String, Object> boxData = new HashMap<>();
@ -1809,7 +1809,7 @@ public class CoDelServiceImpl implements CoDelService {
}
coDelMapper.deletePalletDetail(boxData.get("site").toString(),
boxData.get("buNo").toString(), boxData.get("delNo").toString(),
Integer.parseInt(boxData.get("item_no").toString()), null);
boxData.get("item_no").toString(), null);
coDelMapper.deleteBoxInfo(boxData);
// 如果状态为已报关，发送邮件通知创建人
@ -2050,7 +2050,7 @@ public class CoDelServiceImpl implements CoDelService {
detailData.setSite(site);
detailData.setBuNo(buNo);
detailData.setDelNo(delNo);
detailData.setSeqNo(detail.get("seqNo") != null ? Integer.valueOf(detail.get("seqNo").toString()) : null);
detailData.setSeqNo(detail.get("seqNo") != null ? (String) detail.get("seqNo") : null);
detailData.setItemNo(detail.get("itemNo") != null ? Integer.valueOf(detail.get("itemNo").toString()) : null);
detailData.setNotifyDetailItemNo(detail.get("notifyDetailItemNo") != null ? Integer.valueOf(detail.get("notifyDetailItemNo").toString()) : null);
detailData.setPoNo((String) detail.get("poNo"));
@ -4292,7 +4292,7 @@ public class CoDelServiceImpl implements CoDelService {
boxListData.setSite(site);
boxListData.setBuNo(buNo);
boxListData.setDelNo(delNo);
boxListData.setItemNo(seqNo);
boxListData.setItemNo(seqNo+"");
// 设置箱数、毛重、净重、Rolls
Object boxQtyObj = box.get("box_qty");
@ -4352,7 +4352,7 @@ public class CoDelServiceImpl implements CoDelService {
EcssCoDelPalletDetailData palletDetailData = new EcssCoDelPalletDetailData();
palletDetailData.setDelNo(delNo);
palletDetailData.setSeqNo(seqNo);
palletDetailData.setSeqNo(seqNo+"");
palletDetailData.setBuNo(buNo);
palletDetailData.setSite(site);
palletDetailData.setItemNo(j + 1); // 明细序号从1开始

Write Preview
Loading…
Cancel
Save