|
@@ -254,9 +254,15 @@ public class ProcurementWarehouseReceiveOrderServiceImpl |
|
@@ -254,9 +254,15 @@ public class ProcurementWarehouseReceiveOrderServiceImpl |
|
254
|
option.setWeighingTicketCode(detail.getWeighingTicketCode());
|
254
|
option.setWeighingTicketCode(detail.getWeighingTicketCode());
|
|
255
|
option.setTicketDate(nextDay(detail.getTicketDate()));
|
255
|
option.setTicketDate(nextDay(detail.getTicketDate()));
|
|
256
|
option.setMaterialSource(detail.getSupplierName());
|
256
|
option.setMaterialSource(detail.getSupplierName());
|
|
|
|
257
|
+ option.setSupplierName(detail.getSupplierName());
|
|
257
|
option.setPlanCodes(detail.getPlanCodes());
|
258
|
option.setPlanCodes(detail.getPlanCodes());
|
|
258
|
option.setWorkshopId(detail.getWorkshopId());
|
259
|
option.setWorkshopId(detail.getWorkshopId());
|
|
259
|
option.setWorkshopName(detail.getWorkshopName());
|
260
|
option.setWorkshopName(detail.getWorkshopName());
|
|
|
|
261
|
+ // 公司简称取自过磅码单
|
|
|
|
262
|
+ if (StringUtil.isNotBlank(detail.getWeighingTicketId())) {
|
|
|
|
263
|
+ ProcurementWeighingTicket ticket = weighingTicketMapper.findById(detail.getWeighingTicketId());
|
|
|
|
264
|
+ option.setCompanyShortName(ticket == null ? "" : ticket.getCompanyShortName());
|
|
|
|
265
|
+ }
|
|
260
|
option.setSettleType(detail.getSettleType());
|
266
|
option.setSettleType(detail.getSettleType());
|
|
261
|
options.add(option);
|
267
|
options.add(option);
|
|
262
|
}
|
268
|
}
|
|
@@ -283,6 +289,7 @@ public class ProcurementWarehouseReceiveOrderServiceImpl |
|
@@ -283,6 +289,7 @@ public class ProcurementWarehouseReceiveOrderServiceImpl |
|
283
|
bo.setWeighingTicketCode(settle.getWeighingTicketCode());
|
289
|
bo.setWeighingTicketCode(settle.getWeighingTicketCode());
|
|
284
|
bo.setTicketDate(nextDay(settle.getTicketDate()));
|
290
|
bo.setTicketDate(nextDay(settle.getTicketDate()));
|
|
285
|
bo.setMaterialSource(settle.getSupplierName());
|
291
|
bo.setMaterialSource(settle.getSupplierName());
|
|
|
|
292
|
+ bo.setSupplierName(settle.getSupplierName());
|
|
286
|
bo.setPlanCodes(settle.getPlanCodes());
|
293
|
bo.setPlanCodes(settle.getPlanCodes());
|
|
287
|
bo.setWorkshopId(settle.getWorkshopId());
|
294
|
bo.setWorkshopId(settle.getWorkshopId());
|
|
288
|
bo.setWorkshopName(settle.getWorkshopName());
|
295
|
bo.setWorkshopName(settle.getWorkshopName());
|