|
|
@@ -184,12 +184,13 @@ public class StorageQualitycheckController {
|
|
184
|
184
|
try {
|
|
185
|
185
|
StorageQualitycheck qualitycheck = (StorageQualitycheck)mapper.readValue(qualitycheckJson, StorageQualitycheck.class);
|
|
186
|
186
|
storageQualitycheckService.save(qualitycheck,qualitycheckInspectionJson);
|
|
187
|
|
-
|
|
188
|
|
-
|
|
189
|
187
|
try {
|
|
190
|
188
|
Integer idw = storageQualitycheckService.findId();
|
|
191
|
189
|
//自检或出库 保存或修改数据 把数据推给市平台
|
|
192
|
|
- Map<String, Object> dataMap = storageQualitycheckService.getcheckByIds(idw);
|
|
|
190
|
+ Map<String, Object> dataMap = storageQualitycheckService.getcheckByIds(qualitycheck.getId());
|
|
|
191
|
+ if(dataMap==null){
|
|
|
192
|
+ dataMap = storageQualitycheckService.getcheckByIds(idw);
|
|
|
193
|
+ }
|
|
193
|
194
|
String url = reportPath+"/zjbg/receiveData";//市级接口
|
|
194
|
195
|
String strResult = HttpUtil.doPost(url, JSON.toJSONString(dataMap));
|
|
195
|
196
|
}catch (IOException e) {
|