| @@ -76,7 +76,7 @@ public class WeighingRecordController { | |||||
| @RequestBody WeighingRecord entity) { | @RequestBody WeighingRecord entity) { | ||||
| WeighingRecord weighingRecord= service.save(entity); | WeighingRecord weighingRecord= service.save(entity); | ||||
| if(weighingRecord.getMaterielId()!=null){ | if(weighingRecord.getMaterielId()!=null){ | ||||
| Optional<TransferRecord> result = transferRecordService.findById(weighingRecord.getMaterielId()); | |||||
| Optional<TransferRecord> result = transferRecordService.findById(weighingRecord.getWtId()); | |||||
| if( result.isPresent()){ | if( result.isPresent()){ | ||||
| TransferRecord record= result.get(); | TransferRecord record= result.get(); | ||||
| record .setStatus(1); | record .setStatus(1); | ||||
| @@ -11,6 +11,7 @@ import javax.persistence.*; | |||||
| @ApiModel(description = "品种信息实体") | @ApiModel(description = "品种信息实体") | ||||
| public class MaterialInfo { | public class MaterialInfo { | ||||
| @Id | @Id | ||||
| @GeneratedValue(strategy = GenerationType.IDENTITY) | |||||
| @Column(name = "ID") | @Column(name = "ID") | ||||
| @ApiModelProperty(value = "品种ID", example = "1", notes = "主键,自动生成") | @ApiModelProperty(value = "品种ID", example = "1", notes = "主键,自动生成") | ||||
| private Integer id; | private Integer id; | ||||
| @@ -11,6 +11,7 @@ import javax.persistence.*; | |||||
| @ApiModel(description = "供应商信息实体") | @ApiModel(description = "供应商信息实体") | ||||
| public class Supplier { | public class Supplier { | ||||
| @Id | @Id | ||||
| @GeneratedValue(strategy = GenerationType.IDENTITY) | |||||
| @Column(name = "ID") | @Column(name = "ID") | ||||
| @ApiModelProperty(value = "供应商ID", example = "1", notes = "主键,自动生成") | @ApiModelProperty(value = "供应商ID", example = "1", notes = "主键,自动生成") | ||||
| private Integer id; | private Integer id; | ||||
| @@ -11,6 +11,7 @@ import javax.persistence.*; | |||||
| @ApiModel(description = "供应标识品种信息实体") | @ApiModel(description = "供应标识品种信息实体") | ||||
| public class SupplyVariety { | public class SupplyVariety { | ||||
| @Id | @Id | ||||
| @GeneratedValue(strategy = GenerationType.IDENTITY) | |||||
| @Column(name = "ID") | @Column(name = "ID") | ||||
| @ApiModelProperty(value = "记录ID", example = "1", notes = "主键,自动生成") | @ApiModelProperty(value = "记录ID", example = "1", notes = "主键,自动生成") | ||||
| private Integer id; | private Integer id; | ||||
| @@ -13,6 +13,7 @@ import java.util.Date; | |||||
| @ApiModel(description = "转运记录实体") | @ApiModel(description = "转运记录实体") | ||||
| public class TransferRecord { | public class TransferRecord { | ||||
| @Id | @Id | ||||
| @GeneratedValue(strategy = GenerationType.IDENTITY) | |||||
| @Column(name = "ID") | @Column(name = "ID") | ||||
| @ApiModelProperty(value = "记录ID", example = "1", notes = "主键,自动生成") | @ApiModelProperty(value = "记录ID", example = "1", notes = "主键,自动生成") | ||||
| private Integer id; | private Integer id; | ||||
| @@ -11,6 +11,7 @@ import javax.persistence.*; | |||||
| @ApiModel(description = "运输公司实体") | @ApiModel(description = "运输公司实体") | ||||
| public class TransportCompany { | public class TransportCompany { | ||||
| @Id | @Id | ||||
| @GeneratedValue(strategy = GenerationType.IDENTITY) | |||||
| @Column(name = "编号") | @Column(name = "编号") | ||||
| @ApiModelProperty(value = "公司ID", example = "1", notes = "主键,自动生成") | @ApiModelProperty(value = "公司ID", example = "1", notes = "主键,自动生成") | ||||
| private Integer id; | private Integer id; | ||||
| @@ -11,6 +11,7 @@ import javax.persistence.*; | |||||
| @ApiModel(description = "车辆信息实体") | @ApiModel(description = "车辆信息实体") | ||||
| public class VehicleInfo { | public class VehicleInfo { | ||||
| @Id | @Id | ||||
| @GeneratedValue(strategy = GenerationType.IDENTITY) | |||||
| @Column(name = "ID") | @Column(name = "ID") | ||||
| @ApiModelProperty(value = "车辆ID", example = "1", notes = "主键,自动生成") | @ApiModelProperty(value = "车辆ID", example = "1", notes = "主键,自动生成") | ||||
| private Integer id; | private Integer id; | ||||
| @@ -13,6 +13,7 @@ import java.util.Date; | |||||
| @ApiModel(description = "称重记录实体") | @ApiModel(description = "称重记录实体") | ||||
| public class WeighingRecord { | public class WeighingRecord { | ||||
| @Id | @Id | ||||
| @GeneratedValue(strategy = GenerationType.IDENTITY) | |||||
| @Column(name = "ID") | @Column(name = "ID") | ||||
| @ApiModelProperty(value = "记录ID", example = "1", notes = "主键,自动生成") | @ApiModelProperty(value = "记录ID", example = "1", notes = "主键,自动生成") | ||||
| private Integer id; | private Integer id; | ||||