托书导出调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -1195,13 +1195,15 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 				 if (sheets.hasNext()){
 					 Sheet sheet=(Sheet)sheets.next();
 					 int sheetRow=13;
-
-					 CellStyle style=sheet.getRow(33).getCell(6).getCellStyle();//样式   改成pcs
-					 CellStyle style2=sheet.getRow(33).getCell(7).getCellStyle();//样式   改成美元符号
+					 CellStyle style=sheet.getRow(36).getCell(6).getCellStyle();//样式   改成pcs
+					 CellStyle style2=sheet.getRow(36).getCell(7).getCellStyle();//样式   改成美元符号
 					 for (SyShippingOrderItem item : list){
+					 	if(item.getPkOrg().equals("101")){
+					 		item.setPurchaseOrderNo(item.getPurchaseOutsourcingOrderNo());
+					 	}
 					 	if (sheetRow<25){
 							Row rowT=sheet.getRow(sheetRow);
-							Row rowT2=sheet.getRow(sheetRow+23);
+							Row rowT2=sheet.getRow(sheetRow+24);
 							Cell cellT1=rowT.getCell(6);
 							cellT1.setCellValue(item.getStyleNumber());
 							Cell cellT2=rowT.getCell(7);
@@ -1209,6 +1211,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 							int xNum=1;
 							for (Object obj : item.toString4()){
 								Cell cellT3=rowT2.getCell(xNum);
+//								System.out.println("obj\t"+obj);
 								if (obj!=null){
 									cellT3.setCellValue(obj.toString());
 								}else{
@@ -1218,7 +1221,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 									cellT3.setCellStyle(style);
 									cellT3.setCellValue(new BigDecimal(obj.toString()).doubleValue());
 								}
-								if(xNum>=7){
+								if(xNum>=7&&xNum!=item.toString4().size()){
 									cellT3.setCellStyle(style2);
 									cellT3.setCellValue(new BigDecimal(obj.toString()).doubleValue());
 								}
@@ -1227,7 +1230,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 						}else{
 							list3.add(item);
 						}
-						 sheetRow++;
+					 	sheetRow++;
 					 }
 				 }
 				 //遍历复制sheet

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/entity/SyShippingOrderItem.java

@@ -117,6 +117,11 @@ public class SyShippingOrderItem {
 	@Excel(name = "采购/委外订单号", width = 15)
     @ApiModelProperty(value = "采购/委外订单号")
 	private java.lang.String purchaseOutsourcingOrderNo;
+	/**采购/委外订单号*/
+	@Excel(name = "采购/委外订单号", width = 15)
+	@ApiModelProperty(value = "采购/委外订单号")
+	@TableField(exist = false)
+	private java.lang.String purchaseOrderNo;
 	/**采购/委外工厂*/
 	@Excel(name = "采购/委外工厂", width = 15)
     @ApiModelProperty(value = "采购/委外工厂")
@@ -473,6 +478,7 @@ public class SyShippingOrderItem {
 		strings.add(number.setScale(0));
 		strings.add(declarationUnitPrice);
 		strings.add(declarationTotalPrice);
+		strings.add(purchaseOrderNo);
 		return strings;
 	}
 }