123

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/VehiclePublishReceiveVo.java

@@ -19,6 +19,10 @@ public class VehiclePublishReceiveVo extends VehiclePublishReceive {
     @ApiModelProperty("型号名称")
     String categoryName;
 
+
+    @ApiModelProperty("车牌号")
+    String numberPlate;
+
     @ApiModelProperty("数量")
     Long number;
 
@@ -60,6 +64,10 @@ public class VehiclePublishReceiveVo extends VehiclePublishReceive {
     @ApiModelProperty("接单ids")
     private String ids;
 
+
+    @ApiModelProperty("编号")
+    String code;
+
     private List<VehiclePublishReceiveVo>  publishReceiveVos;
 
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePublishReceiveBiz.java

@@ -143,15 +143,17 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
                     }
                     goodsAmount = publishGoods.getReceiveAmount();
                     payAmount = payAmount.add(goodsAmount);
-                    String cover = publishGoods.getCover();
-                    Integer brandId = publishGoods.getBrandId();
-                    Integer categoryId = publishGoods.getCategoryId();
-                    String extensionList = publishGoods.getExtensionList();
+                    String cover = vehicle.getCover();
+                    Integer brandId = vehicle.getBrandId();
+                    Integer categoryId = vehicle.getCategoryId();
+                    String extensionList = vehicle.getExtensionList();
+                    String code = vehicle.getNumberPlate();
                     if (type == 2 ){
-                        cover = vehicle.getCover();
+                      /*  cover = vehicle.getCover();
                         brandId = vehicle.getBrandId();
                         categoryId = vehicle.getCategoryId();
-                        extensionList = vehicleExtensionBiz.getExtensionIds(vehicleId);
+                        extensionList = vehicleExtensionBiz.getExtensionIds(vehicleId);*/
+                        code="numner."+publishGoodsId;
                     }
                     vehiclePublishReceive.setReceiveCompanyId(publishReceiveDTO.getCompanyId());
                     vehiclePublishReceive.setName(vehicle.getName());
@@ -161,6 +163,7 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
                     vehiclePublishReceive.setCategoryId(categoryId);
                     vehiclePublishReceive.setExtensionList(extensionList);
                     vehiclePublishReceive.setReceiveUserId(publishReceiveDTO.getUserId());
+                    vehiclePublishReceive.setCode(code);
                 }else {
                     VehiclePublishReceive vehiclePublishReceive1  = selectById(id);
                     BeanUtils.copyProperties(vehiclePublishReceive1,vehiclePublishReceive);