diff --git a/src/main/java/com/dev/swms/server/service/base/pojo/DefaultImportFileManager.java b/src/main/java/com/dev/swms/server/service/base/pojo/DefaultImportFileManager.java index afbfa44..3ab0f55 100644 --- a/src/main/java/com/dev/swms/server/service/base/pojo/DefaultImportFileManager.java +++ b/src/main/java/com/dev/swms/server/service/base/pojo/DefaultImportFileManager.java @@ -1593,6 +1593,7 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo @Override public void importOrderDetail(File file) { + /* 订单集合*/ List pickTickets=new ArrayList(); try { Workbook workbook = Workbook.getWorkbook(file); @@ -1632,6 +1633,7 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo PickTicket pickTicket=new PickTicket(); + /*获取工单集合 工单*/ List resultList = pickTickets.stream() .filter(PickTicket -> PickTicket.getCode() == code) .collect(Collectors.toList()); @@ -1667,7 +1669,7 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo pickTicket.setLogisticsCompany(logisticsCompany); pickTicket.setWarehouse(warehouse); commonDao.store(pickTicket); - + /*写入工单集合*/ pickTickets.add(pickTicket); } @@ -1685,11 +1687,12 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo "from PickTicketDetail ptd where ptd.pickTicket.id=:ptId and ptd.lineNumber=:lineNumber and ptd.item.code=:itemCode", new String[] { "ptId","lineNumber","itemCode" }, new Object[] { pickTicket.getId(),lineNumber,itemCode }); if (pickTicketDetailList.size()>0) { + /*重复明细*/ pickTicketDetail=pickTicketDetailList.get(0); pickTicket.setOrderQuantity(pickTicket.getOrderQuantity()+Double.valueOf(orderQuantity)-pickTicketDetail.getOrderQuantity()); commonDao.store(pickTicket); }else { - /* 出库单*/ + /* 新增明细*/ pickTicket.setOrderQuantity(pickTicket.getOrderQuantity()+Double.valueOf(orderQuantity)); pickTicket.setPackageQuantity(pickTicket.getPackageQuantity()+1); commonDao.store(pickTicket);