|
|
@@ -175,27 +175,27 @@ public class StorageFoodbasicInfoServiceImpl implements StorageFoodbasicInfoServ
|
|
175
|
175
|
//④保存分仓保管账
|
|
176
|
176
|
//储粮性质,品种,实际数量,折合标准数量,产地,收货年度
|
|
177
|
177
|
//1.1储粮性质
|
|
178
|
|
- foodbasicInfo.setQuality(qualitycheckVo.getHwxz());
|
|
|
178
|
+ foodbasicInfo.setQuality(qualitycheck.getQuality());
|
|
179
|
179
|
//1.2品种
|
|
180
|
|
- foodbasicInfo.setSubType(Integer.valueOf(qualitycheckVo.getPz()));
|
|
|
180
|
+ foodbasicInfo.setSubType(qualitycheck.getSubType());
|
|
181
|
181
|
//明细品种
|
|
182
|
|
- foodbasicInfo.setSubTypeDetailed(Integer.valueOf(qualitycheckVo.getMxpz()));
|
|
|
182
|
+ foodbasicInfo.setSubTypeDetailed(qualitycheck.getSubTypeDetailed());
|
|
183
|
183
|
|
|
184
|
184
|
//1.3实际数量(kg)
|
|
185
|
|
- foodbasicInfo.setNumber(qualitycheckVo.getKcsl());
|
|
|
185
|
+ foodbasicInfo.setNumber(Double.valueOf(qualitycheck.getNumber()));
|
|
186
|
186
|
//1.4折合标准数量(吨) 将实际数量kg转换成折合标准数量吨
|
|
187
|
|
- foodbasicInfo.setStandNumber(qualitycheckVo.getKcsl()*0.001);
|
|
|
187
|
+ foodbasicInfo.setStandNumber(Double.valueOf(qualitycheck.getNumber())*0.001);
|
|
188
|
188
|
|
|
189
|
189
|
//1.5产地hwcd
|
|
190
|
|
- if(StringUtils.isNoneBlank(qualitycheckVo.getHwcd())){
|
|
191
|
|
- foodbasicInfo.setPlaceOfOrigin(qualitycheckVo.getHwcd());
|
|
|
190
|
+ if(StringUtils.isNoneBlank(String.valueOf(qualitycheck.getLocation()))){
|
|
|
191
|
+ foodbasicInfo.setPlaceOfOrigin(String.valueOf(qualitycheck.getLocation()));
|
|
192
|
192
|
}
|
|
193
|
193
|
//1.6收货年度scnf
|
|
194
|
|
- if(StringUtils.isNoneBlank(qualitycheckVo.getScnf())){
|
|
195
|
|
- foodbasicInfo.setGrowYear(Integer.valueOf(qualitycheckVo.getScnfName()));
|
|
|
194
|
+ if(StringUtils.isNoneBlank(String.valueOf(qualitycheck.getHarvestTime()))){
|
|
|
195
|
+ foodbasicInfo.setGrowYear(qualitycheck.getHarvestTime());
|
|
196
|
196
|
}
|
|
197
|
197
|
//⑤其他
|
|
198
|
|
- foodbasicInfo.setKeepUnite(qualitycheckVo.getDepotName());//所属库点名称
|
|
|
198
|
+ foodbasicInfo.setKeepUnite(qualitycheck.getOrgName());//所属库点名称
|
|
199
|
199
|
foodbasicInfo.setSealStatus("1");//代表已经封仓
|
|
200
|
200
|
|
|
201
|
201
|
// ⑥更新粮食验收
|
|
|
@@ -365,7 +365,7 @@ public class StorageFoodbasicInfoServiceImpl implements StorageFoodbasicInfoServ
|
|
365
|
365
|
|
|
366
|
366
|
//粮食性质 从分仓保管账带出
|
|
367
|
367
|
//1.1储粮性质
|
|
368
|
|
- sb.append(";粮食性质:"+qualitycheckVo.getHwxz());
|
|
|
368
|
+ sb.append(";粮食性质:"+qualitycheck.getQuality());
|
|
369
|
369
|
//业务号:分仓保管账的文件号(粮情卡带出)(粮情卡增加这个字段 保存粮情卡的时候直接从分仓保管账取出)
|
|
370
|
370
|
if(ParameterUtil.isnotnull(qualitycheckVo.getWjh())){
|
|
371
|
371
|
sb.append(";业务号:"+qualitycheckVo.getWjh());
|
|
|
@@ -374,15 +374,15 @@ public class StorageFoodbasicInfoServiceImpl implements StorageFoodbasicInfoServ
|
|
374
|
374
|
}
|
|
375
|
375
|
|
|
376
|
376
|
//数量:粮情卡带出
|
|
377
|
|
- sb.append(";数量:"+qualitycheckVo.getKcsl());
|
|
|
377
|
+ sb.append(";数量:"+qualitycheck.getNumber());
|
|
378
|
378
|
|
|
379
|
379
|
// 品种代码:粮情卡带出(enumCode)
|
|
380
|
|
- sb.append(";品种代码:"+qualitycheckVo.getPzCode());
|
|
|
380
|
+ sb.append(";品种代码:"+qualitycheck.getQuality());
|
|
381
|
381
|
//产地代码:粮情卡带出
|
|
382
|
|
- sb.append(";产地代码:"+qualitycheckVo.getPlaceCode());
|
|
|
382
|
+ sb.append(";产地代码:"+qualitycheck.getLocation());
|
|
383
|
383
|
|
|
384
|
384
|
// 生产年份:粮情卡带出
|
|
385
|
|
- sb.append(";收获年份:"+qualitycheckVo.getScnfName());
|
|
|
385
|
+ sb.append(";收获年份:"+qualitycheck.getHarvestTime());
|
|
386
|
386
|
|
|
387
|
387
|
//等级代码:粮情卡带出
|
|
388
|
388
|
Integer level=qualitycheck.getLevel();
|