Commit a8ef8e795a610195bf2f6baf114a1ba92a35a4c2

Authored by 房远帅
1 parent a78a66f0

采购-入库:仓库收料单问题处理

@@ -32,6 +32,9 @@ public class GetWarehouseReceiveSettleDataBo { @@ -32,6 +32,9 @@ public class GetWarehouseReceiveSettleDataBo {
32 @ApiModelProperty("材料来源(原料结算详情单的单位)") 32 @ApiModelProperty("材料来源(原料结算详情单的单位)")
33 private String materialSource; 33 private String materialSource;
34 34
  35 + @ApiModelProperty("供料单位(与材料来源相同,取自原料结算详情单)")
  36 + private String supplierName;
  37 +
35 @ApiModelProperty("计划编号(关联结算详情单的计划编号)") 38 @ApiModelProperty("计划编号(关联结算详情单的计划编号)")
36 private String planCodes; 39 private String planCodes;
37 40
@@ -41,6 +44,9 @@ public class GetWarehouseReceiveSettleDataBo { @@ -41,6 +44,9 @@ public class GetWarehouseReceiveSettleDataBo {
41 @ApiModelProperty("分厂名称") 44 @ApiModelProperty("分厂名称")
42 private String workshopName; 45 private String workshopName;
43 46
  47 + @ApiModelProperty("公司简称(取自过磅码单)")
  48 + private String companyShortName;
  49 +
44 @ApiModelProperty("结算类型 经销/双经销/买断(取自原料结算详情单)") 50 @ApiModelProperty("结算类型 经销/双经销/买断(取自原料结算详情单)")
45 private String settleType; 51 private String settleType;
46 52
@@ -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());