Commit 869f923b41658b878d974e0f8c7b2ef8cb98dc58

Authored by 房远帅
1 parent de2b6ca9

楚江ERP:规格变更-打印模板修改

... ... @@ -370,6 +370,7 @@ public class OrderChangeRecordController extends DefaultBaseController {
370 370 item.setStatusChange(value);
371 371 item.setQuantityChange(value);
372 372 item.setSalesPriceChange(value);
  373 + item.setDeliveryDateChange(value);
373 374 }
374 375
375 376 /**
... ... @@ -399,6 +400,7 @@ public class OrderChangeRecordController extends DefaultBaseController {
399 400 target.setSalesPriceChange(before.getSalesPrice() != null && after.getSalesPrice() != null
400 401 ? before.getSalesPrice().compareTo(after.getSalesPrice()) != 0
401 402 : !Objects.equals(before.getSalesPrice(), after.getSalesPrice()));
  403 + target.setDeliveryDateChange(!Objects.equals(before.getDeliveryDate(), after.getDeliveryDate()));
402 404 }
403 405
404 406 }
... ...
... ... @@ -174,6 +174,12 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
174 174 private LocalDate deliveryDate;
175 175
176 176 /**
  177 + * 交货日期是否变更
  178 + */
  179 + @TableField(exist = false)
  180 + private Boolean deliveryDateChange;
  181 +
  182 + /**
177 183 * 排序
178 184 */
179 185 private Integer showOrder;
... ...