lvzhikai 5 anni fa
parent
commit
bbdaef6769

+ 4 - 0
src/main/java/com/chinaitop/depot/fumigation/controller/FumigationPlanController.java

@@ -123,6 +123,10 @@ public class FumigationPlanController {
123 123
             List<TFumigationPesticide> list = pesticidePlanService.getFumigationPesticideList(example);
124 124
             if(list.size() > 0)
125 125
                 modelMap.put("pesticideEdit",list.get(0));
126
+
127
+            Map<String, Object> pesticide = pesticidePlanService.finddrugNameById(fumigationId);
128
+            modelMap.put("drugName",pesticide.get("drugName"));//获取药剂名称
129
+            modelMap.put("reagentType",pesticide.get("reagentType"));//获取药剂名称
126 130
         }
127 131
 
128 132
         return modelMap;

+ 2 - 2
src/main/java/com/chinaitop/depot/product/controller/StorageProductFcbgzController.java

@@ -59,7 +59,7 @@ public class StorageProductFcbgzController {
59 59
 
60 60
     })
61 61
     public PageInfo<StorageProductFcbgz> getProductList(HttpServletRequest request, Integer pageNum, Integer pageSize, String houseId, String searchStartDate, String searchEndDate){
62
-        Integer orgId = (Integer) request.getSession().getAttribute("org_id");
62
+        Integer orgId = (Integer) request.getSession().getAttribute("orgId");
63 63
         StorageProductFcbgzExample storageProductFcbgzExample = new StorageProductFcbgzExample();
64 64
         StorageProductFcbgzExample.Criteria criteria = storageProductFcbgzExample.createCriteria();
65 65
         if(ParameterUtil.isnotnull(houseId)){
@@ -104,7 +104,7 @@ public class StorageProductFcbgzController {
104 104
 
105 105
     })
106 106
     public PageInfo<Map<String,Object>> getNumberList(HttpServletRequest request, Integer pageNum, Integer pageSize, String houseId, String wareId){
107
-        Integer orgId = (Integer) request.getSession().getAttribute("org_id");
107
+        Integer orgId = (Integer) request.getSession().getAttribute("orgId");
108 108
 
109 109
         Map<String,Object> map = new HashMap<String, Object>();
110 110
         if(ParameterUtil.isnotnull(houseId)){