推发票调整

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

@@ -23,6 +23,7 @@ import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.alibaba.excel.write.metadata.fill.FillWrapper;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import org.apache.commons.lang.StringUtils;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
@@ -1480,12 +1481,19 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 						 WriteSheet writeSheet2 = EasyExcel.writerSheet("合同").build();
 						 //获取当前日期减去60天
 						 Calendar calendar = Calendar.getInstance();
-						 calendar.setTime(date);
+//						 calendar.setTime(date);
+						 calendar.setTime(entity.getTheFinalShippingDate());
 						 calendar.add(Calendar.DAY_OF_MONTH, -60);
 						 String dateTime = sf.format(calendar.getTime());
 						 Date locale = sf.parse(dateTime);
 						 entity.setDateTime(sdf1.format(locale));
 
+						 calendar.setTime(entity.getTheFinalShippingDate());
+						 calendar.add(Calendar.DAY_OF_MONTH, -10);
+						 dateTime = sf.format(calendar.getTime());
+						 locale = sf.parse(dateTime);
+						 entity.setFinalShippingDateM10(sdf1.format(locale));
+
 						 excelWriter.fill(entity, fillConfig, writeSheet2);
 						 excelWriter.fill(list, fillConfig, writeSheet2);
 
@@ -1496,7 +1504,19 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 						 boolean boo = true;
 						 //重新赋值
-						 entity.setLatestDateOfShipment(sf.format(date));
+						 if(StringUtils.isNotBlank(entity.getLatestDateOfShipment())){
+
+							 Date dateFP = sf.parse(entity.getLatestDateOfShipment());
+							 //获取当前日期减去60天
+							 Calendar calendarFP = Calendar.getInstance();
+							 calendarFP.setTime(dateFP);
+							 calendarFP.add(Calendar.DAY_OF_MONTH, -10);
+							 String dateTimeFP = sf.format(calendarFP.getTime());
+							 Date localeFP = sf.parse(dateTimeFP);
+							 entity.setLatestDateOfShipment(sf.format(localeFP));
+						 }
+//						 //重新赋值
+//						 entity.setLatestDateOfShipment(sf.format(date));
 
 						 if (oConvertUtils.isNotEmpty(list.get(0).getClientAbbreviation())) {
 							 //查询数据字典唛头

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

@@ -404,6 +404,9 @@ public class SyShippingOrder {
 	private String pushSrmState;
 	@TableField(exist = false)
 	private String pushSrmMessage;
+
+	@TableField(exist = false)
+	private String finalShippingDateM10;
 //	public List<SizeTable>  sizeTablesList(){
 //		List<SizeTable>  sizes=new ArrayList<>();
 //		List<String> arrays=new ArrayList<>();