自检 出库检验

src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -6,8 +6,10 @@ import com.alibaba.fastjson.JSONArray;
 import com.chinaitop.depot.storage.model.StorageFoodbasicinfo;
 import com.chinaitop.depot.storage.model.StorageQualitycheck;
 import com.chinaitop.depot.storage.model.StorageQualitycheckExample;
+import com.chinaitop.depot.storage.model.StorageQualitycheckInspectionExample;
 import com.chinaitop.depot.storage.model.StorageQualitycheckExample.Criteria;
 import com.chinaitop.depot.storage.model.StorageQualitycheckSonExample;
+import com.chinaitop.depot.storage.model.StorageQualitystandardMainExample;
 import com.chinaitop.depot.storage.service.StorageQualitycheckService;
 import com.chinaitop.depot.storage.service.StorageQualitycheckSonService;
 import com.chinaitop.depot.storage.utils.DataSynchronization;
@@ -757,5 +759,62 @@ public class StorageQualitycheckController {
             }
         }
     }
+    
+    
+    @RequestMapping(value="/updateDate", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="化验删除数据", notes = "修改数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "qualitycheckJson", value = "质量基础信息JSON数据对象", paramType = "form")
+    })
+    public Map<String, Object> updateDate(String qualitycheckJson) {
+        Map<String, Object> modelMap = new HashMap<>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+            StorageQualitycheck qualitycheck = (StorageQualitycheck)mapper.readValue(qualitycheckJson, StorageQualitycheck.class);
+            
+            StorageQualitycheck qk = new StorageQualitycheck();
+            qk.setOrgId(qualitycheck.getOrgId());
+            qk.setHouseId(qualitycheck.getHouseId());
+            qk.setWarehouseId(qualitycheck.getWarehouseId());
+            qk.setSubType(qualitycheck.getSubType());
+            qk.setSubTypeDetailed(qualitycheck.getSubTypeDetailed());
+            qk.setNumberUpdate(qualitycheck.getNumberUpdate());
+            qk.setLocation(qualitycheck.getLocation());
+            qk.setHarvestTime(qualitycheck.getHarvestTime());
+            qk.setInputTime(qualitycheck.getInputTime());
+            qk.setZhycsj(qualitycheck.getZhycsj());
+            qk.setKeeper(qualitycheck.getKeeper());
+            qk.setChooseTime(qualitycheck.getChooseTime());
+            qk.setChooser(qualitycheck.getChooser());
+            qk.setQyqy(qualitycheck.getQyqy());
+            qk.setQydbh(qualitycheck.getQydbh());
+            qk.setYpbh(qualitycheck.getYpbh());
+            qk.setYpsl(qualitycheck.getYpsl());
+            qk.setDbsl(qualitycheck.getDbsl());
+            qk.setProcessState(1);
+            qk.setHistoryStatus(0);
+            storageQualitycheckService.save(qk,null);
+            /**
+             * 
+             * 删除 之前推给市平台的数据 todo
+             * 
+             * 
+             */
+            storageQualitycheckService.remove(qualitycheck.getId());
+            StorageQualitycheckInspectionExample example = new StorageQualitycheckInspectionExample();
+            StorageQualitycheckInspectionExample.Criteria criteria = example.createCriteria();
+            criteria.andQualitycheckIdEqualTo(qualitycheck.getId());
+            int i = storageQualitycheckService.deleteStorageQualitycheckInspection(example);
+            if(i>0){
+            	 modelMap.put("msg", "success");
+            }
+        } catch (IOException e) {
+            modelMap.put("msg", "error");
+            e.printStackTrace();
+        }
+        return modelMap;
+    }
+    
 
 }

src/main/java/com/chinaitop/depot/storage/service/StorageQualitycheckService.java

@@ -3,6 +3,7 @@ package com.chinaitop.depot.storage.service;
 import com.alibaba.fastjson.JSONArray;
 import com.chinaitop.depot.storage.model.StorageQualitycheck;
 import com.chinaitop.depot.storage.model.StorageQualitycheckExample;
+import com.chinaitop.depot.storage.model.StorageQualitycheckInspectionExample;
 import com.chinaitop.depot.storage.model.StorageQualitycheckSon;
 
 import javax.servlet.http.HttpServletRequest;
@@ -128,4 +129,6 @@ public interface StorageQualitycheckService {
 	Map<String, Object> getcheckByIds(Integer id);
 
 	Integer findId();
+
+	int deleteStorageQualitycheckInspection(StorageQualitycheckInspectionExample example);
 }

src/main/java/com/chinaitop/depot/storage/service/impl/StorageQualitycheckServiceImpl.java

@@ -11,6 +11,7 @@ import com.chinaitop.depot.storage.mapper.StorageQualitycheckSonMapper;
 import com.chinaitop.depot.storage.model.StorageQualitycheck;
 import com.chinaitop.depot.storage.model.StorageQualitycheckExample;
 import com.chinaitop.depot.storage.model.StorageQualitycheckInspection;
+import com.chinaitop.depot.storage.model.StorageQualitycheckInspectionExample;
 import com.chinaitop.depot.storage.model.StorageQualitycheckSon;
 import com.chinaitop.depot.storage.service.StorageQualitycheckService;
 import com.chinaitop.depot.storage.service.StorageQualitycheckSonService;
@@ -380,4 +381,10 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
 	public List<StorageQualitycheck> findByCondition(StorageQualitycheckExample example) {
 		return qualitycheckMapper.selectByExample(example);
 	}
+
+	@Override
+	public int deleteStorageQualitycheckInspection(StorageQualitycheckInspectionExample example) {
+		// TODO Auto-generated method stub
+		return qualityInspectionMapper.deleteByExample(example);
+	}
 }