1.针对轮换计划做出的修改

src/main/java/com/steerinfo/ems/emsprodplanround/controller/EmsProdplanRoundController.java

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -111,10 +112,18 @@ public class EmsProdplanRoundController extends BaseRESTfulController {
             model.setCreatetime(new Date());
             model.setCreateman(userId);
             model.setWorkprocType(model.getWorkprocType());
-            emsProdplanRoundService.add(model);
             emsGmPcJh.setState("3");
             emsGmPcJh.setReceiveTime(new Date());
             emsGmPcJhMapper.updateByPrimaryKeySelective(emsGmPcJh);
+            emsProdplanRoundService.add(model);
+            EmsGmPcJh prodplan = emsGmPcJhMapper.selectByPrimaryKey(model.getParentid());
+            int a = prodplan.getPlanWeight().intValue()*2;
+            if (a>=emsProdplanRoundMapper.getPlanCount(model.getParentid()).intValue()){
+
+            }else {
+                return failed("请检查新增的计划！");
+            }
+
         }
         return success();
     }
@@ -404,8 +413,8 @@ public class EmsProdplanRoundController extends BaseRESTfulController {
        return failed();
     }
     @GetMapping("getstdchem")
-    public RESTfulResult getstdchem(){
-        List<EmsProdplanRound> emsProdplanRounds = emsProdplanRoundService.getchemicalStandard();
+    public RESTfulResult getstdchem(@RequestParam("workprocType") String workprocType){
+        List<EmsProdplanRound> emsProdplanRounds = emsProdplanRoundService.getchemicalStandard(workprocType);
         return success(emsProdplanRounds);
     }
 

src/main/java/com/steerinfo/ems/emsprodplanround/mapper/EmsProdplanRoundMapper.java

@@ -3,7 +3,9 @@ package com.steerinfo.ems.emsprodplanround.mapper;
 import com.steerinfo.ems.emsprodplanround.model.EmsProdplanRound;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -34,7 +36,7 @@ public interface EmsProdplanRoundMapper extends IBaseMapper<EmsProdplanRound, St
     List<EmsProdplanRound> getsurfaceStandard();
 
     //化学成份执行标准
-    List<EmsProdplanRound> getchemicalStandard();
+    List<EmsProdplanRound> getchemicalStandard(@Param("workprocType") String workprocType);
 
     //审核页面数据获取
     List<Map<String, Object>> getAuditDate(HashMap<String, Object> parmas);
@@ -49,4 +51,7 @@ public interface EmsProdplanRoundMapper extends IBaseMapper<EmsProdplanRound, St
     public List<EmsProdplanRound> getTableDetailAsRadio(HashMap<String, Object> parmas);
 
     List<EmsProdplanRound> getLastIssuedData(HashMap<String, Object> params);
+
+    //获取下发计划量总合
+    BigDecimal getPlanCount( @Param("parentid")String parentid);
 }

src/main/java/com/steerinfo/ems/emsprodplanround/mapper/EmsProdplanRoundMapper.xml

@@ -832,7 +832,7 @@
   <select id="getchemicalStandard" resultMap="BaseResultMap">
     select distinct CHEMICAL_STANDARD
     from ems_prodplan_round
-   where CHEMICAL_STANDARD not like '%null%'
+   where CHEMICAL_STANDARD not like '%null%' and workproc_type = #{workprocType}
   </select>
    <select id="getTableDetailAsRadio" parameterType="java.util.HashMap" resultMap="BaseResultMap">
      <include refid="select"/>
@@ -851,4 +851,12 @@
     WHERE ISSUED_TIME is not null AND STATE IN ('1','2') AND WORKPROC_TYPE=#{workprocType} AND ID LIKE '${id}%'  ORDER BY ISSUED_TIME desc)
     WHERE rownum=1
   </select>
+  <select id="getPlanCount" resultType="java.math.BigDecimal">
+    select sum(ABS(PLAN_WEIGHT)) from ems_prodplan_round
+    <where>
+      <if test="parentid != null and parentid != '' ">
+        and PARENTID = #{parentid}
+      </if>
+    </where>
+  </select>
 </mapper>

src/main/java/com/steerinfo/ems/emsprodplanround/service/IEmsProdplanRoundService.java

@@ -39,7 +39,7 @@ public interface IEmsProdplanRoundService extends IBaseService<EmsProdplanRound,
     //获取表面质量标准
     List<EmsProdplanRound>getsurfaceStandard();
     //化学成份执行标准
-    List<EmsProdplanRound> getchemicalStandard();
+    List<EmsProdplanRound> getchemicalStandard(String workprocType);
     // 审核页面查询
     PageList<Map<String, Object>> getAuditDateForPage(HashMap<String, Object> parmas, Integer pageNum,
                                                        Integer pageSize);

src/main/java/com/steerinfo/ems/emsprodplanround/service/impl/EmsProdplanRoundServiceImpl.java

@@ -80,8 +80,8 @@ public class EmsProdplanRoundServiceImpl extends BaseServiceImpl<EmsProdplanRoun
     }
 
     @Override
-    public List<EmsProdplanRound> getchemicalStandard() {
-        return emsProdplanRoundMapper.getchemicalStandard();
+    public List<EmsProdplanRound> getchemicalStandard(String workprocType) {
+        return emsProdplanRoundMapper.getchemicalStandard(workprocType);
     }
 
     @Override