Youchain
/
ZhongWei_Old2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
暴炳林 2025-01-21 15:27:10 +08:00
parent 030554aa7b
commit 3d3994c0a1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/dev/swms/server/service/base/pojo/DefaultImportFileManager.java
View File

@ -1593,6 +1593,7 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo
@Override @Override
public void importOrderDetail(File file) { public void importOrderDetail(File file) {
/* 订单集合*/
List<PickTicket> pickTickets=new ArrayList<PickTicket>(); List<PickTicket> pickTickets=new ArrayList<PickTicket>();
try { try {
Workbook workbook = Workbook.getWorkbook(file); Workbook workbook = Workbook.getWorkbook(file);
@ -1632,6 +1633,7 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo
PickTicket pickTicket=new PickTicket(); PickTicket pickTicket=new PickTicket();
/*获取工单集合 工单*/
List<PickTicket> resultList = pickTickets.stream() List<PickTicket> resultList = pickTickets.stream()
.filter(PickTicket -> PickTicket.getCode() == code) .filter(PickTicket -> PickTicket.getCode() == code)
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -1667,7 +1669,7 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo
pickTicket.setLogisticsCompany(logisticsCompany); pickTicket.setLogisticsCompany(logisticsCompany);
pickTicket.setWarehouse(warehouse); pickTicket.setWarehouse(warehouse);
commonDao.store(pickTicket); commonDao.store(pickTicket);
/*写入工单集合*/
pickTickets.add(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", "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 }); new String[] { "ptId","lineNumber","itemCode" }, new Object[] { pickTicket.getId(),lineNumber,itemCode });
if (pickTicketDetailList.size()>0) { if (pickTicketDetailList.size()>0) {
/*重复明细*/
pickTicketDetail=pickTicketDetailList.get(0); pickTicketDetail=pickTicketDetailList.get(0);
pickTicket.setOrderQuantity(pickTicket.getOrderQuantity()+Double.valueOf(orderQuantity)-pickTicketDetail.getOrderQuantity()); pickTicket.setOrderQuantity(pickTicket.getOrderQuantity()+Double.valueOf(orderQuantity)-pickTicketDetail.getOrderQuantity());
commonDao.store(pickTicket); commonDao.store(pickTicket);
}else { }else {
/* 出库单*/ /* 新增明细*/
pickTicket.setOrderQuantity(pickTicket.getOrderQuantity()+Double.valueOf(orderQuantity)); pickTicket.setOrderQuantity(pickTicket.getOrderQuantity()+Double.valueOf(orderQuantity));
pickTicket.setPackageQuantity(pickTicket.getPackageQuantity()+1); pickTicket.setPackageQuantity(pickTicket.getPackageQuantity()+1);
commonDao.store(pickTicket); commonDao.store(pickTicket);