|
|
@@ -567,7 +567,7 @@ public class SyPackingListTailoringController {
|
|
|
SyPackingListTailoring entity=syPackingListTailoringService.queryId(temp.getId());//已筛选删除状态
|
|
|
temps.add(entity);
|
|
|
}
|
|
|
- String load="D:\\单证模板\\装箱单成衣.xlsx";
|
|
|
+ String load="D:\\单证模板\\装箱单成衣2.xlsx";
|
|
|
int count = temps.size();//分几条sheet
|
|
|
File file=new File(load);
|
|
|
TemplateExportParams templateExcelConstants=new TemplateExportParams(file.getAbsolutePath(),true,"预装箱单");
|
|
|
@@ -576,9 +576,9 @@ public class SyPackingListTailoringController {
|
|
|
for (int i = 1; i <=count ; i++) {
|
|
|
List<SyPackingListTailoring> exportList=new ArrayList<>();
|
|
|
exportList.add(temps.get(i-1));
|
|
|
- SyPackingListTailoring exportList2=temps.get(i-1);
|
|
|
+ SyPackingListTailoring exportList2= temps.get(i-1);
|
|
|
Map<String, Object> map = new HashMap<String, Object>();
|
|
|
- // map.put("entity", exportList2);
|
|
|
+ map.put("entity", exportList);
|
|
|
map.put("admin",userName);
|
|
|
listMap.add(map);
|
|
|
}
|
|
|
@@ -635,7 +635,7 @@ public class SyPackingListTailoringController {
|
|
|
continue;//退出本次循环
|
|
|
}
|
|
|
for (int i=0; i < list.size(); i++) {
|
|
|
- Row row = sheet.createRow(4+i);//列
|
|
|
+ Row row = sheet.createRow(5+i);//列
|
|
|
String strs="";
|
|
|
for (SizeTable size : sypres.getSizeTables()){
|
|
|
strs+=size.getSize()+"，";
|
|
|
@@ -646,7 +646,7 @@ public class SyPackingListTailoringController {
|
|
|
"，配码，件数/箱，箱数，计划尺码数量，计划装箱数量，总件数，" +
|
|
|
"净重/箱，总净重，毛重/箱，总毛重，外箱长度，外箱宽度，" +
|
|
|
"外箱高度，总体积，净净重，备注").split("，");
|
|
|
- Row row2 = sheet.createRow(3);
|
|
|
+ Row row2 = sheet.createRow(4);
|
|
|
for (int x=0;x<params.length;x++){
|
|
|
Cell cell = row2.createCell(x);//横向
|
|
|
if(x>8&&x<params.length-19){
|
huxy