|
@@ -37,6 +37,7 @@ import java.io.Serializable;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
|
+import java.util.Arrays;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Collection;
|
|
import java.util.Collection;
|
|
|
|
|
|
@@ -478,7 +479,21 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
|
|
public boolean add(List<SyPreAssembledPackingList> items1) {
|
|
public boolean add(List<SyPreAssembledPackingList> items1) {
|
|
boolean bool=false;
|
|
boolean bool=false;
|
|
try{
|
|
try{
|
|
- String ids="";
|
|
|
|
|
|
+ /*int num=1;
|
|
|
|
+ String strs="";
|
|
|
|
+ for (SyPreAssembledPackingList item : items1){
|
|
|
|
+ QueryWrapper queryWrapper=new QueryWrapper();
|
|
|
|
+ queryWrapper.eq("sy_Declaration_Elements_Id",item.getSyDeclarationElementsId());
|
|
|
|
+ SyPreAssembledPackingList item2=new SyPreAssembledPackingList();
|
|
|
|
+ if(item2!=null){
|
|
|
|
+ strs+="第"+num+"页的已被预装箱单参照,请勿重复操作\n";
|
|
|
|
+ }
|
|
|
|
+ num++;
|
|
|
|
+ }
|
|
|
|
+ if(!strs.equals("")){
|
|
|
|
+ throw new JeecgBootException(strs);
|
|
|
|
+ }*/
|
|
|
|
+ System.out.println("原单据数量,已参照数量,本次数量");
|
|
for(SyPreAssembledPackingList syPreAssembledPackingList : items1){
|
|
for(SyPreAssembledPackingList syPreAssembledPackingList : items1){
|
|
List<SyPreAssembledPackingListItem> items=syPreAssembledPackingList.getSyPreAssembledPackingListItemList();
|
|
List<SyPreAssembledPackingListItem> items=syPreAssembledPackingList.getSyPreAssembledPackingListItemList();
|
|
SimpleDateFormat sf= new SimpleDateFormat("yyyyMMdd");
|
|
SimpleDateFormat sf= new SimpleDateFormat("yyyyMMdd");
|
|
@@ -497,7 +512,6 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
|
|
syPreAssembledPackingList.setTotalVolume(new BigDecimal("0"));
|
|
syPreAssembledPackingList.setTotalVolume(new BigDecimal("0"));
|
|
syPreAssembledPackingList.setTotalPrice(new BigDecimal("0"));
|
|
syPreAssembledPackingList.setTotalPrice(new BigDecimal("0"));
|
|
syPreAssembledPackingListMapper.insert(syPreAssembledPackingList);//往主表添加数据
|
|
syPreAssembledPackingListMapper.insert(syPreAssembledPackingList);//往主表添加数据
|
|
- ids=ids+syPreAssembledPackingList.getId()+"\n";
|
|
|
|
for (SyPreAssembledPackingListItem item : items){
|
|
for (SyPreAssembledPackingListItem item : items){
|
|
syPreAssembledPackingList.setTotal(syPreAssembledPackingList.getTotal().add(item.getTotal()));
|
|
syPreAssembledPackingList.setTotal(syPreAssembledPackingList.getTotal().add(item.getTotal()));
|
|
syPreAssembledPackingList.setTotalBoxes(syPreAssembledPackingList.getTotalBoxes().add(item.getBoxNumber()));
|
|
syPreAssembledPackingList.setTotalBoxes(syPreAssembledPackingList.getTotalBoxes().add(item.getBoxNumber()));
|
|
@@ -578,4 +592,48 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
|
|
}
|
|
}
|
|
return bool;
|
|
return bool;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public String test(List<SyPreAssembledPackingList> mains) {
|
|
|
|
+ String strs="";
|
|
|
|
+ int num=1;
|
|
|
|
+ for(SyPreAssembledPackingList main : mains){
|
|
|
|
+ BigDecimal total1=new BigDecimal("0");
|
|
|
|
+ BigDecimal total2=new BigDecimal("0");
|
|
|
|
+ BigDecimal total3=new BigDecimal("0");
|
|
|
|
+ for (SyPreAssembledPackingListItem item :main.getSyPreAssembledPackingListItemList()){
|
|
|
|
+ total3=total3.add(item.getTotal());
|
|
|
|
+ String ids="";
|
|
|
|
+ for (SizeTable size : item.getSizeTables()){
|
|
|
|
+ ids+=size.getItemId()+",";//获取出运明细子表id
|
|
|
|
+ }
|
|
|
|
+ if(!ids.equals("")){
|
|
|
|
+ ids=ids.substring(0,ids.length()-1);
|
|
|
|
+ QueryWrapper queryWrapper=new QueryWrapper();
|
|
|
|
+ queryWrapper.in("id", Arrays.asList(ids.split(",")));
|
|
|
|
+ queryWrapper.select("sum(shipment_Quantity) as shipment_Quantity");
|
|
|
|
+ SyShippingDetailsItem syshippings=syShippingDetailsItemMapper.selectOne(queryWrapper);
|
|
|
|
+ System.out.println("syshippings的shipment_Quantity为\t"+syshippings.getShipmentQuantity());
|
|
|
|
+ if(syshippings!=null){
|
|
|
|
+ total1=syshippings.getShipmentQuantity();
|
|
|
|
+ }else{
|
|
|
|
+ throw new JeecgBootException("该单据在上游未找到");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ queryWrapper=new QueryWrapper();
|
|
|
|
+ queryWrapper.in("sy_declaration_elements_item_id", Arrays.asList(ids.split(",")));
|
|
|
|
+ queryWrapper.select("sum(total) as total");
|
|
|
|
+ SyPreAssembledPackingListItem sypre=syPreAssembledPackingListItemMapper.selectOne(queryWrapper);
|
|
|
|
+ if(sypre!=null){
|
|
|
|
+ System.out.println("sypre的total为\t"+sypre.getTotal());
|
|
|
|
+ total2=sypre.getTotal();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ strs+="第"+num+"页原单据数量"+total1+",已参照数量"+total2+",本次数量"+total3+"\n";
|
|
|
|
+ num++;
|
|
|
|
+ }
|
|
|
|
+ System.out.println("strs\n"+strs);
|
|
|
|
+ return strs;
|
|
|
|
+ }
|
|
}
|
|
}
|