虫害优化

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/controller/InsectPestDetectionController.java

@@ -237,22 +237,22 @@ public class InsectPestDetectionController {
         TCcvalue tCcvalue = new TCcvalue();
         TCcdata tCcdata = new TCcdata();
 
-//        if (jsStr.get("dataId") == null) {
-        String orgId = jsStr.get("orgId").toString();
-        tCcvalue.setvCfCode(jsStr.get("vCfCode").toString());//仓房code
-        tCcvalue.setvCcCode(jsStr.get("vCfCode").toString());//仓房code
-        tCcvalue.setOrgId(orgId);//组织机构id
-        tCcvalue.setvUpdateTime(ParameterUtil.string2datetime(jsStr.get("vUpdateTime").toString()));//采集时间
+        if (jsStr.get("dataId") == null) {
+            String orgId = jsStr.get("orgId").toString();
+            tCcvalue.setvCfCode(jsStr.get("vCfCode").toString());//仓房code
+            tCcvalue.setvCcCode(jsStr.get("vCfCode").toString());//仓房code
+            tCcvalue.setOrgId(orgId);//组织机构id
+            tCcvalue.setvUpdateTime(ParameterUtil.string2datetime(jsStr.get("vUpdateTime").toString()));//采集时间
 
-        //害虫检测单号
-        Map<String,Object> map = new HashMap<String, Object>();
-        map.put("orgId", orgId);
-        map.put("vcfcode", jsStr.get("vCfCode").toString());
-        map.put("updateTime", ParameterUtil.string2datetime(jsStr.get("vUpdateTime").toString()));
-        List<Map<String,Object>> jcdList = insectPestDetectionService.getJcd(map);
-        String jcd = ObjectUtils.toString(jcdList.get(0).get("jcd"));
-        tCcvalue.setHcjcdh(jcd);
-        tCcvalue.setId(uuidUtils.getCode());//唯一id
+            //害虫检测单号
+            Map<String,Object> map = new HashMap<String, Object>();
+            map.put("orgId", orgId);
+            map.put("vcfcode", jsStr.get("vCfCode").toString());
+            map.put("updateTime", ParameterUtil.string2datetime(jsStr.get("vUpdateTime").toString()));
+            List<Map<String,Object>> jcdList = insectPestDetectionService.getJcd(map);
+            String jcd = ObjectUtils.toString(jcdList.get(0).get("jcd"));
+            tCcvalue.setHcjcdh(jcd);
+            tCcvalue.setId(UuidUtils.getCode());//唯一id
 
             tCcdata.setOrgId(orgId);//组织机构id
             tCcdata.setvHwCode(jsStr.get("vHwCode").toString());//货位code
@@ -266,39 +266,37 @@ public class InsectPestDetectionController {
             tCcdata.setCldjpd(jsStr.get("cldjpd")==null ? "":jsStr.get("cldjpd").toString());//虫粮等级判定
             tCcdata.setHckyxfx(jsStr.get("hckyxfx")==null ? "":jsStr.get("hckyxfx").toString());//害虫抗药性分析
             tCcdata.setvUpdatePeople(jsStr.get("vUpdatePeople").toString());//检测人
-            tCcdata.setId(uuidUtils.getCode());//唯一id
+            tCcdata.setId(UuidUtils.getCode());//唯一id
             tCcdata.setDataSource("1");//数据来源0是自动检测，1是手工录入
             tCcdata.setJchcff("0");
             insectPestDetectionService.add(tCcdata, tCcvalue);//熏蒸计划
-//        } else {
-//            tCcvalue.setvCfCode(jsStr.get("vCfCode").toString());//仓房code
-//            tCcvalue.setvUpdateTime(ParameterUtil.string2date(jsStr.get("vUpdateTime").toString()));//采集时间
-//            tCcvalue.setId(jsStr.get("id").toString());
-//
-//            tCcdata.setvHwCode(jsStr.get("vHwCode").toString());//货位code
-//            tCcdata.setStandOr(jsStr.get("standOr").toString());//扦养人
-//            tCcdata.setStandTime(ParameterUtil.string2date(jsStr.get("standTime").toString()));//扦养时间
-//            tCcdata.setHczl(jsStr.get("hczl").toString());//害虫种类
-//            tCcdata.setiValue(Integer.parseInt(jsStr.get("iValue").toString()));//数量
-//            tCcdata.setvUpdateTime(ParameterUtil.string2date(jsStr.get("vUpdateTime").toString()));//监测时间
-//            tCcdata.setvUpdatePeople(jsStr.get("vUpdatePeople").toString());//检测人
-//            insectPestDetectionService.update(tCcdata, tCcvalue);
-//        }
+        } else {
+            tCcvalue.setvUpdateTime(ParameterUtil.string2datetime(jsStr.get("vUpdateTime").toString()));//采集时间
+            tCcvalue.setId(jsStr.get("valueId").toString());
+
+            tCcdata.setStandOr(jsStr.get("standOr")==null ? "":jsStr.get("standOr").toString());//扦养人
+            tCcdata.setStandTime(ParameterUtil.string2datetime(jsStr.get("standTime").toString()));//扦养时间
+            tCcdata.setHczl(jsStr.get("hczl").toString());//害虫种类
+            tCcdata.setiValue(Integer.parseInt(jsStr.get("iValue").toString()));//数量
+            tCcdata.setvUpdateTime(ParameterUtil.string2datetime(jsStr.get("vUpdateTime").toString()));//监测时间
+            tCcdata.setJchcff(jsStr.get("jchcff")==null ? "":jsStr.get("jchcff").toString());//检查害虫方法
+            tCcdata.setCldjpd(jsStr.get("cldjpd")==null ? "":jsStr.get("cldjpd").toString());//虫粮等级判定
+            tCcdata.setHckyxfx(jsStr.get("hckyxfx")==null ? "":jsStr.get("hckyxfx").toString());//害虫抗药性分析
+            tCcdata.setvUpdatePeople(jsStr.get("vUpdatePeople").toString());//检测人
+            tCcdata.setId(jsStr.get("dataId").toString());
+            insectPestDetectionService.update(tCcdata, tCcvalue);
+        }
         return ResponseEntity.ok(modelMap);
     }
 
-
-    @RequestMapping(value = "/getInsectPestDeatil", method = RequestMethod.POST)
-    @ApiOperation(value = "修改虫害单仓手工录入数据", notes = "修改虫害单仓手工录入数据")
+    @RequestMapping(value = "/getInsectPestEdit", method = RequestMethod.POST)
+    @ApiOperation(value = "查询虫害详情", notes = "查询虫害详情")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "insectPestId", value = "虫害检测id", paramType = "query")
+            @ApiImplicitParam(name = "dataId", value = "详情表id", paramType = "query"),
+            @ApiImplicitParam(name = "valueId", value = "害虫检测单号表id", paramType = "query")
     })
-    public ResponseEntity getInsectPestDeatil(String insectPestId) {
-        TCcdata tCcdata = new TCcdata();
-        TCcdataExample example = new TCcdataExample();
-        TCcdataExample.Criteria criteria = example.createCriteria();
-        criteria.andIdEqualTo(insectPestId);
-        List<TCcdata> tccdataList = insectPestDetectionService.getInsectPestDeatil(example);
-        return ResponseEntity.ok(tccdataList);
+    public ResponseEntity getInsectPestEdit(String dataId,String valueId) {
+        Map<String, Object> modelMap = insectPestDetectionService.getInsectPestEdit(dataId,valueId);
+        return ResponseEntity.ok(modelMap);
     }
 }

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/mapper/TCcdataMapper.xml

@@ -396,7 +396,9 @@
     td.i_value AS iValue,
     td.v_update_people AS vUpdatePeople,
     td.v_update_time AS vUpdateTime,
-    tv.hcjcdh AS hcjcdh
+    tv.hcjcdh AS hcjcdh,
+    td.id AS dataId,
+    tv.id AS valueId
     FROM
     t_ccdata td
     LEFT JOIN t_ccvalue tv ON td.v_update_time = tv.v_update_time

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/mapper/TCcvalueMapper.xml

@@ -12,6 +12,8 @@
     <result column="v_avg" property="vAvg" jdbcType="DECIMAL" />
     <result column="v_update_time" property="vUpdateTime" jdbcType="TIMESTAMP" />
     <result column="data_source" property="dataSource" jdbcType="VARCHAR" />
+    <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
+    <result column="hcjcdh" property="hcjcdh" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -73,7 +75,7 @@
   </sql>
   <sql id="Base_Column_List" >
     id, org_id, v_cc_code, z_zd_code, v_cf_code, v_max, v_min, v_avg, v_update_time, 
-    data_source
+    data_source, updatetime, hcjcdh
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.intelligent.grainsituation.model.TCcvalueExample" >
     select
@@ -99,11 +101,13 @@
     insert into t_ccvalue (id, org_id, v_cc_code, 
       z_zd_code, v_cf_code, v_max, 
       v_min, v_avg, v_update_time, 
-      data_source,hcjcdh)
+      data_source, updatetime, hcjcdh
+      )
     values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=VARCHAR}, #{vCcCode,jdbcType=VARCHAR}, 
       #{zZdCode,jdbcType=VARCHAR}, #{vCfCode,jdbcType=VARCHAR}, #{vMax,jdbcType=INTEGER}, 
       #{vMin,jdbcType=INTEGER}, #{vAvg,jdbcType=DECIMAL}, #{vUpdateTime,jdbcType=TIMESTAMP}, 
-      #{dataSource,jdbcType=VARCHAR}, #{hcjcdh,jdbcType=VARCHAR})
+      #{dataSource,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP}, #{hcjcdh,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.intelligent.grainsituation.model.TCcvalue" >
     insert into t_ccvalue
@@ -138,6 +142,12 @@
       <if test="dataSource != null" >
         data_source,
       </if>
+      <if test="updatetime != null" >
+        updatetime,
+      </if>
+      <if test="hcjcdh != null" >
+        hcjcdh,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -170,6 +180,12 @@
       <if test="dataSource != null" >
         #{dataSource,jdbcType=VARCHAR},
       </if>
+      <if test="updatetime != null" >
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="hcjcdh != null" >
+        #{hcjcdh,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.intelligent.grainsituation.model.TCcvalueExample" resultType="java.lang.Integer" >
@@ -211,6 +227,12 @@
       <if test="record.dataSource != null" >
         data_source = #{record.dataSource,jdbcType=VARCHAR},
       </if>
+      <if test="record.updatetime != null" >
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.hcjcdh != null" >
+        hcjcdh = #{record.hcjcdh,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -227,7 +249,9 @@
       v_min = #{record.vMin,jdbcType=INTEGER},
       v_avg = #{record.vAvg,jdbcType=DECIMAL},
       v_update_time = #{record.vUpdateTime,jdbcType=TIMESTAMP},
-      data_source = #{record.dataSource,jdbcType=VARCHAR}
+      data_source = #{record.dataSource,jdbcType=VARCHAR},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      hcjcdh = #{record.hcjcdh,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -308,17 +332,16 @@
     GROUP BY v_update_time
     ORDER BY v_update_time DESC LIMIT 0,1
   </select>
-  
+
   <select id="getJcd" parameterType="java.util.Map" resultType="java.util.Map">
-  	SELECT
-		concat(credit_code,LPAD(org_id, 3, 0),LPAD(#{vcfcode}, 4, 0),DATE_FORMAT(STR_TO_DATE(#{updateTime},'%Y-%m-%d %H:%i:%s'),'%Y%m%d%H%i'),'00000') jcd
-	FROM
-		org_info
+    SELECT
+    concat(credit_code,LPAD(org_id, 3, 0),LPAD(#{vcfcode}, 4, 0),DATE_FORMAT(STR_TO_DATE(#{updateTime},'%Y-%m-%d %H:%i:%s'),'%Y%m%d%H%i'),'00000') jcd
+    FROM
+    org_info
     <where>
       <if test="orgId != null">
         org_id = #{orgId}
       </if>
     </where>
   </select>
-
 </mapper>

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/model/TCcvalue.java

@@ -24,6 +24,8 @@ public class TCcvalue {
 
     private String dataSource;
 
+    private Date updatetime;
+
     private String hcjcdh;
 
     /**
@@ -186,12 +188,35 @@ public class TCcvalue {
         this.dataSource = dataSource == null ? null : dataSource.trim();
     }
 
-	public String getHcjcdh() {
-		return hcjcdh;
-	}
+    /**
+     * 
+     * @return updatetime 
+     */
+    public Date getUpdatetime() {
+        return updatetime;
+    }
 
-	public void setHcjcdh(String hcjcdh) {
-		this.hcjcdh = hcjcdh == null ? null : hcjcdh.trim();
-	}
-	
+    /**
+     * 
+     * @param updatetime 
+     */
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+
+    /**
+     * 害虫检查单号
+     * @return hcjcdh 害虫检查单号
+     */
+    public String getHcjcdh() {
+        return hcjcdh;
+    }
+
+    /**
+     * 害虫检查单号
+     * @param hcjcdh 害虫检查单号
+     */
+    public void setHcjcdh(String hcjcdh) {
+        this.hcjcdh = hcjcdh == null ? null : hcjcdh.trim();
+    }
 }

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/model/TCcvalueExample.java

@@ -75,7 +75,7 @@ public class TCcvalueExample {
     }
 
     /**
-     * t_ccvalue 2019-03-07
+     * t_ccvalue 2020-12-07
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -777,6 +777,136 @@ public class TCcvalueExample {
             addCriterion("data_source not between", value1, value2, "dataSource");
             return (Criteria) this;
         }
+
+        public Criteria andUpdatetimeIsNull() {
+            addCriterion("updatetime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNotNull() {
+            addCriterion("updatetime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeEqualTo(Date value) {
+            addCriterion("updatetime =", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotEqualTo(Date value) {
+            addCriterion("updatetime <>", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThan(Date value) {
+            addCriterion("updatetime >", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("updatetime >=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThan(Date value) {
+            addCriterion("updatetime <", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("updatetime <=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIn(List<Date> values) {
+            addCriterion("updatetime in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotIn(List<Date> values) {
+            addCriterion("updatetime not in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeBetween(Date value1, Date value2) {
+            addCriterion("updatetime between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("updatetime not between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcjcdhIsNull() {
+            addCriterion("hcjcdh is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcjcdhIsNotNull() {
+            addCriterion("hcjcdh is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcjcdhEqualTo(String value) {
+            addCriterion("hcjcdh =", value, "hcjcdh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcjcdhNotEqualTo(String value) {
+            addCriterion("hcjcdh <>", value, "hcjcdh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcjcdhGreaterThan(String value) {
+            addCriterion("hcjcdh >", value, "hcjcdh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcjcdhGreaterThanOrEqualTo(String value) {
+            addCriterion("hcjcdh >=", value, "hcjcdh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcjcdhLessThan(String value) {
+            addCriterion("hcjcdh <", value, "hcjcdh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcjcdhLessThanOrEqualTo(String value) {
+            addCriterion("hcjcdh <=", value, "hcjcdh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcjcdhLike(String value) {
+            addCriterion("hcjcdh like", value, "hcjcdh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcjcdhNotLike(String value) {
+            addCriterion("hcjcdh not like", value, "hcjcdh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcjcdhIn(List<String> values) {
+            addCriterion("hcjcdh in", values, "hcjcdh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcjcdhNotIn(List<String> values) {
+            addCriterion("hcjcdh not in", values, "hcjcdh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcjcdhBetween(String value1, String value2) {
+            addCriterion("hcjcdh between", value1, value2, "hcjcdh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcjcdhNotBetween(String value1, String value2) {
+            addCriterion("hcjcdh not between", value1, value2, "hcjcdh");
+            return (Criteria) this;
+        }
     }
 
     /**
@@ -790,7 +920,7 @@ public class TCcvalueExample {
     }
 
     /**
-     * t_ccvalue 2019-03-07
+     * t_ccvalue 2020-12-07
      */
     public static class Criterion {
         private String condition;

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/InsectPestDetectionService.java

@@ -61,5 +61,5 @@ public interface InsectPestDetectionService {
 
     void update(TCcdata tCcdata,TCcvalue tCcvalue);
 
-    List<TCcdata> getInsectPestDeatil(TCcdataExample example);
+    Map<String, Object> getInsectPestEdit(String dataId,String valueId);
 }

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/impl/InsectPestDetectionServiceImpl.java

@@ -199,7 +199,20 @@ public class InsectPestDetectionServiceImpl implements InsectPestDetectionServic
     }
 
     @Override
-    public List<TCcdata> getInsectPestDeatil(TCcdataExample example) {
-        return tCcdataMapper.selectByExample(example);
+    public Map<String, Object> getInsectPestEdit(String dataId,String valueId) {
+        TCcdataExample example = new TCcdataExample();
+        TCcdataExample.Criteria criteria = example.createCriteria();
+        criteria.andIdEqualTo(dataId);
+        List<TCcdata> tccDataList = tCcdataMapper.selectByExample(example);
+
+        TCcvalueExample tCcvalueExample = new TCcvalueExample();
+        TCcvalueExample.Criteria criteria1 = tCcvalueExample.createCriteria();
+        criteria1.andIdEqualTo(valueId);
+        List<TCcvalue> tccValueList = tCcvalueMapper.selectByExample(tCcvalueExample);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("tccDataList",tccDataList.get(0));
+        map.put("tccValueList",tccValueList.get(0));
+        return map;
     }
 }

depot-web/src/main/resources/static/app/intelligent/fumigation/controller/fumigationPlanCtrl.js

@@ -267,11 +267,14 @@ angular.module('app.intelligent')
         
         //通过仓房获取害虫检查单号
         fumigationPlanService.getJcd(houseId,$stateParams.fumigationId).then(function(data){
-        	$scope.jcdList = data;
+            if(data.length > 0){
+                $scope.fumigation.hcjcdh = data[0].hcjcdh;
+            }else{
+                $scope.fumigation.hcjcdh = null;
+            }
         },function(data){
         	console.log(data);
         });
-        
     };
 
     // 置空根据houseId获取的数据.
@@ -574,7 +577,10 @@ angular.module('app.intelligent')
 
     // 审批菜单中选择审批人后通过、驳回、拒绝.
     $scope.audit = function (fumigation, result, content, state) {
-        if(state == '0' || state == '6'){
+        if(state == '6'){
+            state = '7'
+        }
+        if(state == '0' || state == '7'){
             if(null == content || content == 'undefined'){
                 alert("请填写审批意见！");
                 return ;

depot-web/src/main/resources/static/app/intelligent/fumigation/views/plan/fumigationPlan-edit.html

@@ -16,7 +16,7 @@
 									<span class="pull-right font-xs">带*的部分必须填写</span>
 								</header>
                                 <fieldset>
-                                
+
                                 <table style="width:70%; border-width:5px; margin-left:15%;position:relative;margin-right:15%;">
                                 	<table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
                                 		<!--第一个tr开始 -->
@@ -29,7 +29,7 @@
 											</th>
 											<th width='15%'>
 												<section >
-			                                        <label class="input"> 
+			                                        <label class="input">
 			                                            <input class="form-control" type="text" ng-model="orgName"
 			                                            ng-readonly="true" ng-init="orgName = depotInfo.orgName">
 			                                        </label>
@@ -54,7 +54,7 @@
 											</th>
 											<th width='15%'>
 												<section>
-		                                            <label class="select"> 
+		                                            <label class="select">
 		                                                <select ng-model="storehouse.houseType" name="houseType" ng-disabled="true"
 		                                                ng-options="enum.enumid as enum.enumname for enum in dicDataList[1064]">
 		                                                	<option value="">--请选择--</option>
@@ -196,11 +196,8 @@
 											</th>
 											<th>
 												<section>
-													<label class="select">
-														<select ng-model="fumigation.hcjcdh" name="hcjcd" required class="form-control"
-															ng-options="store.hcjcdh as store.hcjcdh for store in jcdList">
-															<option value="">--请选择--</option>
-														</select>
+													<label class="input">
+														<input class="form-control" type="text" ng-model="fumigation.hcjcdh" name="hcjcdh" disabled>
 													</label>
 												</section>
 											</th>
@@ -422,7 +419,7 @@
 												</section>
 											</th>
 											<th>
-												<label label class="label" style="margin-top: 9px;text-align: center;">施药方法</label>
+												<label label class="label" style="margin-top: 9px;text-align: center;">施药方法<span style="color: red;">*</span></label>
 											</th>
 											<th>
 												<section>
@@ -468,7 +465,7 @@
 												</section>
 											</th>
 											<th>
-												<label label class="label" style="margin-top: 9px;text-align: center;">环流熏蒸方式</label>
+												<label label class="label" style="margin-top: 9px;text-align: center;">环流熏蒸方式<span style="color: red;">*</span></label>
 											</th>
 											<th>
 												<section>

depot-web/src/main/resources/static/app/intelligent/grainDetection/controller/insectPestDetectionCtrl.js

@@ -23,9 +23,9 @@ angular.module('app.intelligent').controller("insectPestDetectionCtrl", function
     };
     $scope.loadData();
 
-    // 新增页面
-    $scope.showAdd = function() {
-        $state.go("app.intelligent.grainDetection.insectPestDetectionEdit");
+    // 新增/修改/查看页面
+    $scope.showUpdate = function(insetType,dataId,valueId) {
+        $state.go("app.intelligent.grainDetection.insectPestDetectionEdit",{insetType:insetType,dataId:dataId,valueId:valueId});
     };
 
     // 获取所有仓房code
@@ -239,90 +239,98 @@ angular.module('app.intelligent').controller("insectPestDetectionCtrl", function
         }
     };
 })
-    // 虫害手工录入
-    .controller("insectPestEditCtrl", function($scope, $filter, $http, $stateParams, $state, $rootScope, $uibModal, insectPestDetectionService,
-                                               warehouseService) {
+// 虫害手工录入
+.controller("insectPestEditCtrl", function($scope, $filter, $http, $stateParams, $state, $rootScope, $uibModal, insectPestDetectionService,
+                                           warehouseService) {
+
+    $scope.insectPests = {};
+    $scope.saveFlag = false;
+    $scope.SFUpdate = false;
+
+    $scope.loadDataById = function(dataId,valueId) {
+        insectPestDetectionService.getInsectPestEdit(dataId,valueId).then(function(data){
+            $scope.insectPests = data.data.tccDataList;
+            $scope.houseId = Number($rootScope.storeHouseCodeObj[data.data.tccDataList.vCcCode].storehouseId);
+            $scope.loadWare($scope.houseId);
+            $scope.insectPests.vHwCode = Number(data.data.tccDataList.vHwCode);
+            $scope.insectPests.hczl = Number(data.data.tccDataList.hczl);
+            $scope.insectPests.hcjcdh = data.data.tccValueList.hcjcdh;
+            $scope.insectPests.vUpdateTime = data.data.tccValueList.vUpdateTime;
+            $scope.insectPests.valueId = valueId;
+            $scope.insectPests.dataId = dataId;
+        },function(data){
+            console.log(data);
+        });
+    };
 
-        $scope.insectPests = {};
-        $scope.saveFlag = false;
-        $scope.insectPests.vUpdatePeople = $rootScope.userInfo.username;
+    if ($stateParams.insetType == "add") {//新增
+        $scope.insectPests.vUpdatePeople = $rootScope.userInfo.realName;
         $scope.insectPests.orgId = $rootScope.depotInfo.orgId;
+    }else if($stateParams.insetType == "detail"){//详情
+        $scope.isNotSave = true;
+        $("#insectPests-form input").attr("disabled",true);
+        $("#insectPests-form select").attr("disabled",true);
+        $scope.loadDataById($stateParams.dataId,$stateParams.valueId);
+    }else if($stateParams.insetType == "edit"){//修改
+        $scope.SFUpdate = true;
+        $("#insectPests-form input").attr("disabled",false);
+        $("#insectPests-form select").attr("disabled",false);
+        $scope.loadDataById($stateParams.dataId,$stateParams.valueId);
+    }
 
-        $scope.loadDataById = function(id) {
-            insectPestDetectionService.getFumigationPlanDeatil(id).then(function(data){
-                $scope.insectPests = data.fumigationEdit;
-            },function(data){
-                console.log(data);
-            });
-        };
-
-        if ($stateParams.fumType == "add") {//新增
-            $scope.insectPests.vUpdatePeople = $rootScope.userInfo.userId;
-            $scope.insectPests.orgId = $rootScope.depotInfo.orgId;
-        }else if($stateParams.fumType == "detail"){//详情
-            $scope.isNotSave = true;
-            $("#fumigationPlan-form input").attr("disabled",true);
-            $("#fumigationPlan-form select").attr("disabled",true);
-            $scope.loadDataById($stateParams.fumigationId);
-        }else if($stateParams.fumType == "edit"){//修改
-            $("#fumigationPlan-form input").attr("disabled",false);
-            $("#fumigationPlan-form select").attr("disabled",false);
-            $scope.loadDataById($stateParams.fumigationId);
-        }
+    var validator = $("#insectPests-form").validate();
 
-        var validator = $("#insectPests-form").validate();
-
-        // 自定义验证，验证熏蒸次数
-        $.validator.addMethod("validFrequency",function(value,element, params) {
-            var checkNumber = /^\+?[1-9]\d*$/;
-            return this.optional(element)||(checkNumber.test(value));
-        },"请输入大于0的整数！");
-
-        // 货位列表
-        $scope.loadWare = function(houseId) {
-            $scope.insectPests.vCfCode = $rootScope.storehouseObj[houseId].storehouseCode;
-            warehouseService.getStorehouse($rootScope.orgInfo.orgId, houseId).then(function(data){
-                $scope.warelist = data.wareList;
-            },function(data){
-                console.log(data);
-            });
-        };
-
-        // 返回.
-        $scope.retList = function () {
-            $rootScope.back();
-        };
-
-        // 保存.
-        $scope.saveData = function () {
-            if (!$scope.saveFlag) {
-                if (validator.form()) {
-                    // 设置saveFlag为true,防止重复提交.
-                    $scope.saveFlag = true;
-                    $("input[name='vUpdateTime']").each(function(j,item){
-                        if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
-                            $scope.insectPests.vUpdateTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
-                        }
-                    });
-                    $("input[name='standTime']").each(function(j,item){
-                        if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
-                            $scope.insectPests.standTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
-                        }
-                    });
-
-                    //保存熏蒸数据
-                    insectPestDetectionService.saveInsectPestDate($scope.insectPests).then(function(data){
-                        if(data.message == "success"){
-                            alert("保存成功！");
-                            $scope.retList();
-                        } else {
-                            alert("保存失败！");
-                            $scope.saveFlag = false;
-                        }
-                    },function(data){
-                        console.log(data);
-                    });
-                }
+    // 自定义验证，验证熏蒸次数
+    $.validator.addMethod("validFrequency",function(value,element, params) {
+        var checkNumber = /^\+?[1-9]\d*$/;
+        return this.optional(element)||(checkNumber.test(value));
+    },"请输入大于0的整数！");
+
+    // 货位列表
+    $scope.loadWare = function(houseId) {
+        $scope.insectPests.vCfCode = $rootScope.storehouseObj[houseId].storehouseCode;
+        warehouseService.getStorehouse($rootScope.orgInfo.orgId, houseId).then(function(data){
+            $scope.warelist = data.wareList;
+        },function(data){
+            console.log(data);
+        });
+    };
+
+    // 返回.
+    $scope.retList = function () {
+        $rootScope.back();
+    };
+
+    // 保存.
+    $scope.saveData = function () {
+        if (!$scope.saveFlag) {
+            if (validator.form()) {
+                // 设置saveFlag为true,防止重复提交.
+                $scope.saveFlag = true;
+                $("input[name='vUpdateTime']").each(function(j,item){
+                    if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
+                        $scope.insectPests.vUpdateTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
+                    }
+                });
+                $("input[name='standTime']").each(function(j,item){
+                    if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
+                        $scope.insectPests.standTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
+                    }
+                });
+
+                //保存熏蒸数据
+                insectPestDetectionService.saveInsectPestDate($scope.insectPests).then(function(data){
+                    if(data.message == "success"){
+                        alert("保存成功！");
+                        $scope.retList();
+                    } else {
+                        alert("保存失败！");
+                        $scope.saveFlag = false;
+                    }
+                },function(data){
+                    console.log(data);
+                });
             }
         }
-    })
+    }
+})

depot-web/src/main/resources/static/app/intelligent/grainDetection/service/insectPestDetectionService.js

@@ -1,127 +0,0 @@
-"use strict";
-angular.module('app.intelligent').service("insectPestDetectionService", function($http, $q, APP_CONFIG, $rootScope) {
-
-    // 分页列表数据
-    this.getInsectPestDetectionPageInfo = function (pageInfo,search) {
-        var orgId = $rootScope.orgInfo.orgId;
-        var d = $q.defer();
-        $http({
-            method : 'GET',
-            url : APP_CONFIG.intelligentUrl + '/intelligents/insectPestDetection/getList',
-            params : {
-                pageNum : pageInfo.pageNum,
-                pageSize : pageInfo.pageSize,
-                vCfCode : search == undefined ? "":search.vCfCode,
-                iBeginTdh : search == undefined ? "":search.iBeginTdh,
-                iEndTdh : search == undefined ? "":search.iEndTdh,
-                orgId : orgId
-            }
-        }).then(function successCallback(response) {
-            // 请求成功执行代码
-            d.resolve(response.data);
-        }, function errorCallback(response) {
-            // 请求失败执行代码
-            d.reject("error");
-        });
-        return d.promise;
-    };
-
-    // 查询图表数据
-    this.getByCfCode = function (search) {
-        var d = $q.defer();
-        $http({
-            method : 'GET',
-            url : APP_CONFIG.intelligentUrl + '/intelligents/insectPestDetection/getByCfCode',
-            params : {
-                vCfCode : search == undefined ? "":search.vCfCode,
-                searchStartDate : search == undefined ? "":search.searchStartDate,
-                searchEndDate : search == undefined ? "":search.searchEndDate
-            }
-        }).then(function successCallback(response) {
-            // 请求成功执行代码
-            d.resolve(response.data);
-        }, function errorCallback(response) {
-            // 请求失败执行代码
-            d.reject("error");
-        });
-        return d.promise;
-    };
-
-    /*// 虫害逐仓实时检测接口
-    this.nowInsectPest = function (storeCode) {
-        var d = $q.defer();
-        $http({
-            method : 'POST',
-            url : APP_CONFIG.intelligentUrl + '/intelligents/insectPestDetection/sendNowInsectPest',
-            data : {
-                storeCode : storeCode
-            }
-        }).then(function successCallback(response) {
-            // 请求成功执行代码
-            d.resolve(response.data);
-        }, function errorCallback(response) {
-            // 请求失败执行代码
-            d.reject("error");
-        });
-        return d.promise;
-    };*/
-
-    // 虫害单仓检测接口
-    this.onlyInsectPestDetection = function (vCfCode) {
-        var d = $q.defer();
-        $http({
-            method : 'POST',
-            url : APP_CONFIG.intelligentUrl + '/intelligents/insectPestDetection/sendOnlyInsectPestDetection',
-            data : {
-                vCfCode : vCfCode,
-                orgId: $rootScope.depotInfo.orgId
-            }
-        }).then(function successCallback(response) {
-            // 请求成功执行代码
-            d.resolve(response.data);
-        }, function errorCallback(response) {
-            // 请求失败执行代码
-            d.reject("error");
-        });
-        return d.promise;
-    };
-
-    // 虫害全库检测接口
-    this.allInsectPestDetection = function () {
-        var d = $q.defer();
-        $http({
-            method : 'GET',
-            url : APP_CONFIG.intelligentUrl + '/intelligents/insectPestDetection/sendInsectPestDetectionAll',
-            params : {
-                orgId: $rootScope.depotInfo.orgId
-            }
-        }).then(function successCallback(response) {
-            // 请求成功执行代码
-            d.resolve(response.data);
-        }, function errorCallback(response) {
-            // 请求失败执行代码
-            d.reject("error");
-        });
-        return d.promise;
-    };
-
-    // 虫害单仓手工录入
-    this.saveInsectPestDate = function (insectPests) {
-        var d = $q.defer();
-        $http({
-            method : 'POST',
-            url : APP_CONFIG.intelligentUrl + '/intelligents/insectPestDetection/addInsectPestData',
-            data : {
-                insectPests : angular.toJson(insectPests)
-            }
-        }).then(function successCallback(response) {
-            // 请求成功执行代码
-            d.resolve(response.data);
-        }, function errorCallback(response) {
-            // 请求失败执行代码
-            d.reject("error");
-        });
-        return d.promise;
-    };
-
-});

depot-web/src/main/resources/static/app/intelligent/grainDetection/views/insectPestDetection-edit.html

@@ -25,6 +25,19 @@
 
 								<fieldset>
 									<table class="table table-striped table-bordered table-hover" width="100%">
+										<tr ng-show="insectPests.hcjcdh != null">
+											<th width='15%'>
+												<label class="label" style="margin-top: 9px;text-align: center;">害虫检测单号<span style="color: red;">*</span></label>
+											</th>
+											<th width='30%' colspan="2">
+												<label class="input">
+													<input type="text" ng-model="insectPests.hcjcdh" required ng-disabled="SFUpdate || isNotSave"/>
+												</label>
+											</th>
+											<th></th>
+											<th></th>
+											<th></th>
+										</tr>
 										<tr>
 											<th width='15%'>
 												<label class="label" style="margin-top: 9px;text-align: center;">仓房名称<span style="color: red;">*</span></label>
@@ -33,7 +46,7 @@
 												<label class="select">
 													<select ng-model="houseId" name="houseId" class="form-control input-sm"
 															ng-options="store.storehouseId as store.storehouseName for store in storelist"
-															ng-change="loadWare(houseId)" required>
+															ng-change="loadWare(houseId)" required ng-disabled="SFUpdate || isNotSave">
 														<option value="">请选择</option>
 													</select> <i></i>
 												</label>
@@ -44,7 +57,7 @@
 											<th width='15%'>
 												<label class="select">
 													<select ng-model="insectPests.vHwCode" name="vHwCode" class="form-control input-sm"
-															ng-options="ware.warehouseId as ware.warehouseName for ware in warelist" required>
+															ng-options="ware.warehouseId as ware.warehouseName for ware in warelist" required ng-disabled="SFUpdate || isNotSave">
 														<option value="">请选择</option>
 													</select> <i></i>
 												</label>
@@ -66,11 +79,11 @@
 										</tr>
 										<tr>
 											<th>
-												<label class="label" style="margin-top: 9px;text-align: center;">扦样人</label>
+												<label class="label" style="margin-top: 9px;text-align: center;">扦样人<span style="color: red;">*</span></label>
 											</th>
 											<th>
 												<label class="input">
-													<input type="text" ng-model="insectPests.standOr"/>
+													<input type="text" ng-model="insectPests.standOr" required/>
 												</label>
 											</th>
 											<th>
@@ -155,7 +168,7 @@
 									</table>
 								</fieldset>
 								<footer class="text-align-center">
-									<button type="button" class="btn btn-primary" ng-click="saveData()">保存</button>
+									<button type="button" ng-show="(SFUpdate && !isNotSave) || (!SFUpdate && !isNotSave)" class="btn btn-primary" ng-click="saveData()">保存</button>
 									<button type="button" class="btn btn-default" ng-click="retList()">取消</button>
 								</footer>
 								<div id="dtBox"></div><!-- 时间控件：有时分秒 -->

depot-web/src/main/resources/static/app/intelligent/grainDetection/views/insectPestDetection-list.html

@@ -17,7 +17,7 @@
                                     <div class="col-xs-12 col-sm-10">
                                         <a href-void class="btn btn-default btn-sm" ng-show="isShow" ng-click="retList()"><i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;</a>
                                         <label>
-                                            <a href-void class="btn btn-primary btn-sm" ng-click="showAdd()"><i class="fa fa-plus"></i>&nbsp;新&nbsp;增</a>
+                                            <a href-void class="btn btn-primary btn-sm" ng-click="showUpdate('add')"><i class="fa fa-plus"></i>&nbsp;新&nbsp;增</a>
                                         </label>&emsp;
                                         <label> 仓房名称:&emsp;
                                             <select ng-model="search.vCfCode" class="form-control input-sm"
@@ -56,12 +56,10 @@
                                         <th data-class="expand" style="text-align:center;">序号</th>
                                         <th data-class="expand" style="text-align:center;">仓房名称</th>
                                         <th data-class="expand" style="text-align:center;">货位名称</th>
-                                        <th data-class="expand" style="text-align:center;">扦养人</th>
-                                        <th data-class="expand" style="text-align:center;">扦养时间</th>
+                                        <th data-class="expand" style="text-align:center;">害虫检测单号</th>
                                         <th data-class="expand" style="text-align:center;">通道号</th>
                                         <th data-class="expand" style="text-align:center;">害虫种类</th>
                                         <th data-class="expand" style="text-align:center;">虫情(个)</th>
-                                        <th data-class="expand" style="text-align:center;">检测人</th>
                                         <th data-class="expand" style="text-align:center;">检测时间</th>
                                         <th data-class="expand" style="text-align:center;">操作</th>
                                     </tr>
@@ -72,15 +70,19 @@
                                         <td style="text-align:center;">{{ $index + 1 }}</td>
                                         <td style="text-align:center;">{{ storeHouseCodeObj[insectPest.vCfCode].storehouseName }}</td>
                                         <td style="text-align:center;">{{ wares[insectPest.vHwId].warehouseName }}</td>
-                                        <td style="text-align:center;">{{ insectPest.standOr }}</td>
-                                        <td style="text-align:center;">{{ insectPest.standTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
+                                        <td style="text-align:center;">{{ insectPest.hcjcdh }}</td>
                                         <td style="text-align:center;">{{ insectPest.iTdh }}</td>
                                         <td style="text-align:center;">{{ dicData[insectPest.hczl] }}</td>
                                         <td style="text-align:center;">{{ insectPest.iValue }}</td>
-                                        <td style="text-align:center;">{{ insectPest.vUpdatePeople }}</td>
                                         <td style="text-align:center;">{{ insectPest.vUpdateTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         <td style="text-align:center;">
-                                            <a ng-hide="insectPest.iTdh == null" href-void ng-click="onlyInsectPestDetection(insectPest.vCfCode)"><i class=""></i>{{storeHouseCodeObj[insectPest.vCfCode].storehouseName}}检测</a>
+                                            <span ng-hide="insectPest.iTdh == null">
+                                                 <a href-void ng-click="onlyInsectPestDetection(insectPest.vCfCode)"><i class=""></i>{{storeHouseCodeObj[insectPest.vCfCode].storehouseName}}检测</a>
+                                            </span>
+                                            <span ng-hide="insectPest.standOr == null">
+                                                 <a href-void ng-click="showUpdate('edit',insectPest.dataId,insectPest.valueId)"><i class=""></i>修改</a>
+                                                 <a href-void ng-click="showUpdate('detail',insectPest.dataId,insectPest.valueId)"><i class=""></i>查看</a>
+                                            </span>
                                         </td>
                                     </tr>
                                     </tbody>

depot-web/src/main/resources/static/app/intelligent/module.js

@@ -266,7 +266,7 @@ angular.module('app.intelligent',['ui.router']).config(function($stateProvider)
         )
         // 虫害手工录入
         .state('app.intelligent.grainDetection.insectPestDetectionEdit', {
-                url: '/intelligent/grainDetection/insectPestDetectionEdit',
+                url: '/intelligent/grainDetection/insectPestDetectionEdit/:insetType/:dataId/:valueId',
                 data: {
                     title: '虫害检测数据'
                 },