Ver código fonte

封仓后能修改一次产地

lvzhikai 4 anos atrás
pai
commit
1a694c833e

+ 37 - 0
src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -3,6 +3,7 @@ package com.chinaitop.depot.storage.controller;
3
 
3
 
4
 import com.chinaitop.depot.storage.model.*;
4
 import com.chinaitop.depot.storage.model.*;
5
 import com.chinaitop.depot.storage.model.StorageQualitycheckExample.Criteria;
5
 import com.chinaitop.depot.storage.model.StorageQualitycheckExample.Criteria;
6
+import com.chinaitop.depot.storage.service.StorageFoodbasicInfoService;
6
 import com.chinaitop.depot.storage.service.StorageQualitycheckInspectionService;
7
 import com.chinaitop.depot.storage.service.StorageQualitycheckInspectionService;
7
 import com.chinaitop.depot.storage.service.StorageQualitycheckService;
8
 import com.chinaitop.depot.storage.service.StorageQualitycheckService;
8
 import com.chinaitop.depot.storage.service.StorageQualitycheckSonService;
9
 import com.chinaitop.depot.storage.service.StorageQualitycheckSonService;
@@ -47,6 +48,9 @@ public class StorageQualitycheckController {
47
     @Resource
48
     @Resource
48
     private StorageQualitycheckInspectionService qualitycheckInspectionService;
49
     private StorageQualitycheckInspectionService qualitycheckInspectionService;
49
 
50
 
51
+    @Resource
52
+    private StorageFoodbasicInfoService foodbasicInfoService;
53
+
50
     // 获取ip地址
54
     // 获取ip地址
51
     @Value("${crk-webservice}")
55
     @Value("${crk-webservice}")
52
     private String url;
56
     private String url;
@@ -818,6 +822,39 @@ public class StorageQualitycheckController {
818
         }
822
         }
819
         return pageInfo;
823
         return pageInfo;
820
     }
824
     }
825
+
826
+    /**
827
+     * 封仓后修改地址
828
+     * @param location
829
+     * @return
830
+     */
831
+    @RequestMapping(value="/updateOrigin", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
832
+    @ApiOperation(value="封仓后修改地址", notes = "根据库里现场情况,需加功能封仓后需要修改一次地址")
833
+    @ApiImplicitParams({
834
+            @ApiImplicitParam(name = "id", value = "检验表id", paramType = "query"),
835
+            @ApiImplicitParam(name = "foodbasicinfoId", value = "封仓表id", paramType = "query"),
836
+            @ApiImplicitParam(name = "location", value = "地址信息", paramType = "form")
837
+    })
838
+    public Map<String, Object> updateOrigin(Integer id,Integer foodbasicinfoId,Integer location) {
839
+        StorageQualitycheck storageQualitycheck = new StorageQualitycheck();
840
+        StorageFoodbasicinfo storageFoodbasicinfo = new StorageFoodbasicinfo();
841
+        Map<String, Object> modelMap = new HashMap<String, Object>();
842
+        try {
843
+            storageQualitycheck.setId(id);
844
+            storageQualitycheck.setLocation(location);
845
+            storageQualitycheckService.setQualitycheckType(storageQualitycheck);
846
+
847
+
848
+            storageFoodbasicinfo.setId(foodbasicinfoId);
849
+            storageFoodbasicinfo.setValidHouseCapacity("0000");
850
+            foodbasicInfoService.updateByPrimaryKey(storageFoodbasicinfo);
851
+            modelMap.put("status", "success");
852
+        } catch (Exception e) {
853
+            modelMap.put("status", "error");
854
+            e.printStackTrace();
855
+        }
856
+        return modelMap;
857
+    }
821
     
858
     
822
     
859
     
823
     //质检信息主表同步
860
     //质检信息主表同步

+ 3 - 1
src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitycheckMapper.xml

@@ -1925,12 +1925,14 @@
1925
     bb.storageTank_name tankName,
1925
     bb.storageTank_name tankName,
1926
     bb.tank_type storehouseType,
1926
     bb.tank_type storehouseType,
1927
     bb.tank_capacity designCapacity,
1927
     bb.tank_capacity designCapacity,
1928
-    sf.foodbasicinfo_id foodbasicinfoId
1928
+    sf.foodbasicinfo_id foodbasicinfoId,
1929
+    foods.valid_house_capacity validHouseCapacity
1929
     FROM storage_qualitycheck sqk
1930
     FROM storage_qualitycheck sqk
1930
     LEFT JOIN basic_storehouse bs on bs.storehouse_id = sqk.house_id
1931
     LEFT JOIN basic_storehouse bs on bs.storehouse_id = sqk.house_id
1931
     LEFT JOIN basic_warehouse bw  on bw.warehouse_id = sqk.warehouse_id
1932
     LEFT JOIN basic_warehouse bw  on bw.warehouse_id = sqk.warehouse_id
1932
     LEFT JOIN basic_tank bb on bb.id = sqk.tank_id
1933
     LEFT JOIN basic_tank bb on bb.id = sqk.tank_id
1933
     LEFT JOIN storage_foodbasicinfochecks sf on sf.qualitycheck_id = sqk.id
1934
     LEFT JOIN storage_foodbasicinfochecks sf on sf.qualitycheck_id = sqk.id
1935
+    LEFT JOIN storage_foodbasicinfo foods on foods.id = sf.foodbasicinfo_id
1934
     <where>
1936
     <where>
1935
       <if test="id !=null">
1937
       <if test="id !=null">
1936
         and sqk.id = #{id}
1938
         and sqk.id = #{id}

+ 9 - 0
src/main/java/com/chinaitop/depot/storage/model/StorageQualitycheck.java

@@ -66,6 +66,7 @@ public class StorageQualitycheck {
66
     private String orgName;
66
     private String orgName;
67
 
67
 
68
     private Integer foodbasicinfoId;
68
     private Integer foodbasicinfoId;
69
+    private String validHouseCapacity;
69
 
70
 
70
     //封仓业务字段
71
     //封仓业务字段
71
     private String disperseCapacity;
72
     private String disperseCapacity;
@@ -3088,4 +3089,12 @@ public class StorageQualitycheck {
3088
     public void setAcceptId(String acceptId) {
3089
     public void setAcceptId(String acceptId) {
3089
         this.acceptId = acceptId;
3090
         this.acceptId = acceptId;
3090
     }
3091
     }
3092
+
3093
+    public String getValidHouseCapacity() {
3094
+        return validHouseCapacity;
3095
+    }
3096
+
3097
+    public void setValidHouseCapacity(String validHouseCapacity) {
3098
+        this.validHouseCapacity = validHouseCapacity;
3099
+    }
3091
 }
3100
 }

+ 1 - 0
src/main/java/com/chinaitop/depot/storage/service/StorageFoodbasicInfoService.java

@@ -54,4 +54,5 @@ public interface StorageFoodbasicInfoService {
54
 	List<StorageFoodbasicinfo> findByCondition(StorageFoodbasicinfoExample example);
54
 	List<StorageFoodbasicinfo> findByCondition(StorageFoodbasicinfoExample example);
55
 
55
 
56
 	List<StorageFoodbasicinfo> findFoodS(StorageFoodbasicinfo foodbasicinfo);
56
 	List<StorageFoodbasicinfo> findFoodS(StorageFoodbasicinfo foodbasicinfo);
57
+	void updateByPrimaryKey(StorageFoodbasicinfo foodbasicinfo);
57
 }
58
 }

+ 5 - 1
src/main/java/com/chinaitop/depot/storage/service/impl/StorageFoodbasicInfoServiceImpl.java

@@ -382,7 +382,11 @@ public class StorageFoodbasicInfoServiceImpl implements StorageFoodbasicInfoServ
382
 
382
 
383
     @Override
383
     @Override
384
     public List<StorageFoodbasicinfo> findFoodS(StorageFoodbasicinfo foodbasicinfo) {
384
     public List<StorageFoodbasicinfo> findFoodS(StorageFoodbasicinfo foodbasicinfo) {
385
-        // TODO Auto-generated method stub
386
         return foodbasicInfoMapper.findFoodS(foodbasicinfo);
385
         return foodbasicInfoMapper.findFoodS(foodbasicinfo);
387
     }
386
     }
387
+
388
+    @Override
389
+    public void updateByPrimaryKey(StorageFoodbasicinfo foodbasicinfo) {
390
+        foodbasicInfoMapper.updateByPrimaryKeySelective(foodbasicinfo);
391
+    }
388
 }
392
 }