Ver código fonte

增加轮换类型

ZeroLiYi 1 ano atrás
pai
commit
3c6ea5a3d1

+ 2 - 0
src/main/java/com/chinaitop/depot/rp/model/BusinessRpReport.java

@@ -53,6 +53,8 @@ public class BusinessRpReport implements Serializable {
53 53
 
54 54
     @ApiModelProperty(value = "计划类型 1: 粮食轮换计划; 2: 油料轮换计划;")
55 55
     private Integer planType;
56
+    @ApiModelProperty(value = "轮换类型 1:静态轮换;2:动态轮换;")
57
+    private Integer type;
56 58
 
57 59
     @ApiModelProperty(value = "计划年度")
58 60
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy", timezone = "GMT+8")

+ 4 - 4
src/main/java/com/chinaitop/depot/rp/service/impl/BusinessRpReportServiceImpl.java

@@ -107,10 +107,10 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
107 107
         Map<String,Object> result = new HashMap<>();
108 108
         result.put("status", "error");
109 109
         List<BusinessRpInbound>  businessRpInbound = businessRpReport.getBusinessRpInboundList();
110
-        if (businessRpInbound.size() <= 0){
111
-            result.put("msg", "出库信息不能为空");
112
-            return result;
113
-        }
110
+//        if (businessRpInbound.size() <= 0){
111
+//            result.put("msg", "出库信息不能为空");
112
+//            return result;
113
+//        }
114 114
         BusinessRpInboundExample businessRpInboundExample =new BusinessRpInboundExample();
115 115
        businessRpReport.setUpdateTime(new Date());
116 116
         if(businessRpReport.getStatus()==0){ //保存