|
@@ -118,10 +118,6 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
|
|
118
|
public Map<String, Object> add(BusinessRpReport businessRpReport) {
|
118
|
public Map<String, Object> add(BusinessRpReport businessRpReport) {
|
|
119
|
Map<String,Object> result = new HashMap<>();
|
119
|
Map<String,Object> result = new HashMap<>();
|
|
120
|
List<BusinessRpInbound> businessRpInbound = businessRpReport.getBusinessRpInboundList();
|
120
|
List<BusinessRpInbound> businessRpInbound = businessRpReport.getBusinessRpInboundList();
|
|
121
|
-// if (businessRpInbound.size() <= 0){
|
|
|
|
122
|
-// result.put("msg", "出库信息不能为空");
|
|
|
|
123
|
-// return result;
|
|
|
|
124
|
-// }
|
|
|
|
125
|
BusinessRpInboundExample businessRpInboundExample =new BusinessRpInboundExample();
|
121
|
BusinessRpInboundExample businessRpInboundExample =new BusinessRpInboundExample();
|
|
126
|
businessRpReport.setUpdateTime(new Date());
|
122
|
businessRpReport.setUpdateTime(new Date());
|
|
127
|
if(businessRpReport.getStatus()==0){ //保存
|
123
|
if(businessRpReport.getStatus()==0){ //保存
|
|
@@ -165,7 +161,7 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
|
|
165
|
|
161
|
|
|
166
|
}else{//提交
|
162
|
}else{//提交
|
|
167
|
|
163
|
|
|
168
|
- if(businessRpReport.getId()!=null){//修改
|
|
|
|
|
|
164
|
+ if(businessRpReport.getId()!=null){
|
|
169
|
//根据id查找主表数据
|
165
|
//根据id查找主表数据
|
|
170
|
BusinessRpReportVO businessRpReportVO =businessRpReportMapper.getRpReportFindByById(businessRpReport.getId());
|
166
|
BusinessRpReportVO businessRpReportVO =businessRpReportMapper.getRpReportFindByById(businessRpReport.getId());
|
|
171
|
if(businessRpReportVO!=null){
|
167
|
if(businessRpReportVO!=null){
|
|
@@ -199,6 +195,7 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
|
|
199
|
|
195
|
|
|
200
|
businessRpReport.setCreateTime(new Date());
|
196
|
businessRpReport.setCreateTime(new Date());
|
|
201
|
businessRpReport.setUpdateTime(new Date());
|
197
|
businessRpReport.setUpdateTime(new Date());
|
|
|
|
198
|
+ businessRpReport.setReportTime(new Date());
|
|
202
|
businessRpReportMapper.insert(businessRpReport);
|
199
|
businessRpReportMapper.insert(businessRpReport);
|
|
203
|
List<BusinessRpInbound> inList =businessRpReport.getBusinessRpInboundList();
|
200
|
List<BusinessRpInbound> inList =businessRpReport.getBusinessRpInboundList();
|
|
204
|
for (BusinessRpInbound br: inList) {
|
201
|
for (BusinessRpInbound br: inList) {
|