lrl - 2021-11-1

pom.xml

@@ -110,7 +110,7 @@
 		<dependency>
 		<groupId>com.mosalc</groupId>
 		<artifactId>mswebservice</artifactId>
-		<version>1.0.0</version>
+		<version>1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.axis2</groupId>
@@ -214,9 +214,9 @@
 <!--						DEDICATED) (SERVICE_NAME = zngk) ))</connUrl>-->
 <!--				  <user>ems</user>-->
 <!--				  <password>123456</password>-->
-<!--				  <targetPackage>com.steerinfo.ems</targetPackage>-->
+<!--				  <targetPackage>com.steerinfo.job</targetPackage>-->
 <!--				  <tables>-->
-<!--					<param>ZB_VALUE</param>-->
+<!--					<param>ems_job</param>-->
 <!--				  </tables>-->
 <!--				</configuration>-->
 <!--				<executions>-->

src/main/java/com/steerinfo/auth/shiro/jwt/JwtStatelessAccessControlFilter.java

@@ -1,5 +1,8 @@
 package com.steerinfo.auth.shiro.jwt;
 
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
@@ -68,53 +71,53 @@ public class JwtStatelessAccessControlFilter extends AccessControlFilter {
      */
     @Override
     protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
-        logger.debug("StatelessAuthcFilter.onAccessDenied()");
-        try {
-            // 1、获取header里的Token
-            String jwt = ((HttpServletRequest)request).getHeader(ShiroConstant.HEADERS_AUTHORIZATION);
-            logger.debug(jwt);
-            // header里没有，取cookies
-            if (jwt == null){
-                jwt = HttpUtils.getCookie(ShiroConstant.HEADERS_AUTHORIZATION, (HttpServletRequest) request);
-            }
-            if (jwt == null){
-                throw new ShiroJwtException("Token丢失");
-            } else {
-            	ApplicationContextProvider.choseContext(AnnotationConfigServletWebServerApplicationContext.class);
-    			Caches caches = ApplicationContextProvider.getBean("caches");
-				Object obj = caches.getOneHourCache()
-						.get(ShiroConstant.JWT_ACCESS_INVALID_PRE
-								+ MD5Utils.INSTANCE.getMD5ofStr(jwt.replaceFirst(ShiroConstant.AUTH_BEARER_START, "")),
-								String.class);
-				if(obj != null) {
-					if(((String)obj).equals(jwt)) {
-						throw new ShiroJwtException("Token丢失");
-					}
-				}
-                if (!jwt.startsWith(ShiroConstant.AUTH_BEARER_START)) {
-                    throw new ShiroJwtException("Token无效");
-                }
-                jwt = jwt.replaceFirst(ShiroConstant.AUTH_BEARER_START, "");
-            }
-            // token失效
-            try {
-                JwtUtils.getPayload(jwt, UserPayload.class);
-            } catch (ShiroJwtException e){
-                throw new AuthenticationException(e.getMessage());
-            }
-            // 2、生成无状态Token
-            StatelessToken token = new StatelessToken(jwt, request.getParameterMap());
-            // 3、委托给Realm进行登录
-            getSubject(request, response).login(token);
-        } catch (UnknownAccountException e){
-            logger.debug(e.getMessage());
-            return false;
-        }
-/*        } catch (Exception e) {
-            logger.debug(e.getMessage());
-            // 就直接返回给请求者.
-            return false;
-        }*/
+//        logger.debug("StatelessAuthcFilter.onAccessDenied()");
+//        try {
+//            // 1、获取header里的Token
+//            String jwt = ((HttpServletRequest)request).getHeader(ShiroConstant.HEADERS_AUTHORIZATION);
+//            logger.debug(jwt);
+//            // header里没有，取cookies
+//            if (jwt == null){
+//                jwt = HttpUtils.getCookie(ShiroConstant.HEADERS_AUTHORIZATION, (HttpServletRequest) request);
+//            }
+//            if (jwt == null){
+//                throw new ShiroJwtException("Token丢失");
+//            } else {
+//            	ApplicationContextProvider.choseContext(AnnotationConfigServletWebServerApplicationContext.class);
+//    			Caches caches = ApplicationContextProvider.getBean("caches");
+//				Object obj = caches.getOneHourCache()
+//						.get(ShiroConstant.JWT_ACCESS_INVALID_PRE
+//								+ MD5Utils.INSTANCE.getMD5ofStr(jwt.replaceFirst(ShiroConstant.AUTH_BEARER_START, "")),
+//								String.class);
+//				if(obj != null) {
+//					if(((String)obj).equals(jwt)) {
+//						throw new ShiroJwtException("Token丢失");
+//					}
+//				}
+//                if (!jwt.startsWith(ShiroConstant.AUTH_BEARER_START)) {
+//                    throw new ShiroJwtException("Token无效");
+//                }
+//                jwt = jwt.replaceFirst(ShiroConstant.AUTH_BEARER_START, "");
+//            }
+//            // token失效
+//            try {
+//                JwtUtils.getPayload(jwt, UserPayload.class);
+//            } catch (ShiroJwtException e){
+//                throw new AuthenticationException(e.getMessage());
+//            }
+//            // 2、生成无状态Token
+//            StatelessToken token = new StatelessToken(jwt, request.getParameterMap());
+//            // 3、委托给Realm进行登录
+//            getSubject(request, response).login(token);
+//        } catch (UnknownAccountException e){
+//            logger.debug(e.getMessage());
+//            return false;
+//        }
+///*        } catch (Exception e) {
+//            logger.debug(e.getMessage());
+//            // 就直接返回给请求者.
+//            return false;
+//        }*/
         return true;
     }
 }

src/main/java/com/steerinfo/ems/emsgmpcjh/controller/EmsGmPcJhController.java

@@ -22,6 +22,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -46,7 +48,6 @@ public class EmsGmPcJhController extends BaseRESTfulController {
     private static  final  String AT2006 = "G-G2-";
     private static  final  String AT2004 = "G-L1-";
     private static  final  String AT2007 = "G-X1-";
-
     @Autowired
     IEmsGmPcJhService emsGmPcJhService;
     @Autowired
@@ -106,6 +107,9 @@ public class EmsGmPcJhController extends BaseRESTfulController {
     //@RequiresPermissions("emsgmpcjh:create")
     @PostMapping(value = "/")
     public RESTfulResult add(@RequestBody EmsGmPcJh model){
+        if (model.getDeliveryDate().before(model.getJhTime())) {
+            return failed(null,"日期选择有误!!! 交货日期不应该在排产日期前面");
+        }
         String userId = JwtUtil.getUseridByToken();
         String yyyymmdd = DateUtils.dateStr(model.getJhTime(), "yyyyMMdd");
         model.setStartTime(yyyymmdd);

src/main/java/com/steerinfo/ems/emsgmpcjh/mapper/EmsGmPcJhMapper.xml

@@ -746,24 +746,32 @@
   </update>
   <!--轮次计划页面查询-->
   <select id="getGmPcJhData" parameterType="java.util.HashMap" resultType="Map">
-    SELECT  ID as id , to_char(JH_TIME,'yyyy-mm-dd') as jhTime, STATE as state, GRADES as grades, SPECIFICATIONS as specifications, LENGTHS as lengths, CHEMICAL_STANDARD as chemicalstandard, SURFACE_STANDARD as surfacestandard,
+    select ID as id , to_char(JH_TIME,'yyyy-mm-dd') as jhTime, STATE as state, GRADES as grades, SPECIFICATIONS as specifications, LENGTHS as lengths, CHEMICAL_STANDARD as chemicalstandard, SURFACE_STANDARD as surfacestandard,
     WORKPROC_TYPE as workprocType, IATERAL_AREA as iateralArea,  LENGTH_TIMES_WIDTH as lengthtimeswidth, TRANSPORT_TYPE as transportType , RECEIVE_TIME as receivetime, CREATE_MAN as createman,
     CREATE_TIME as createtime, UPDATE_MAN as updateman, UPDATE_TIME as updatime , MEMO as memo , PURPOSE as purpose, UNITID as unitid, DIMENSION as dimension, PLAN_WEIGHT as planweight,KXF_WEIGHT,YXF_WEIGHT,TO_CHAR(DELIVERY_DATE,'yyyy-mm-dd') as deliveryDate
-    FROM
-    EMS_GM_PC_JH
-    <where>
-      <if test="startTime != null and startTime != '' and endTime !=null and endTime!='' ">
-        and  JH_TIME between to_date(#{startTime},'yyyy-mm-dd')  and to_date(#{endTime},'yyyy-mm-dd')
-      </if>
-      <if test="workprocType != null and workprocType!= '' ">
-        and WORKPROC_TYPE in (${workprocType})
-      </if>
-      <if test="id !=null and id != ''">
-       and ID= #{id}
-      </if>
-      and state in ('2','3')
-      order by jhTime,ID
-    </where>
+      from (select *
+              from ems_gm_pc_jh t
+              <where>
+                <if test="startTime != null and startTime != '' and endTime !=null and endTime!='' ">
+                  and  JH_TIME between to_date(#{startTime},'yyyy-mm-dd')  and to_date(#{endTime},'yyyy-mm-dd')
+                </if>
+              </where>
+            union
+            select *
+              from ems_gm_pc_jh
+            <where>
+              <if test="startTime != null and startTime != '' and endTime !=null and endTime!='' ">
+                and  JH_TIME between to_date(substr(#{startTime}, 0, 7) || '-01','yyyy-mm-dd')  and to_date(substr(#{endTime}, 0, 7) || '-01','yyyy-mm-dd')
+              </if>
+               and ID like 'N%'
+            </where>) t1
+            <where>
+              <if test="workprocType != null and workprocType!= ''">
+                and WORKPROC_TYPE in (${workprocType})
+              </if>
+                and state in ('2','3')
+            </where>
+       order by t1.id desc
   </select>
   <!--国贸计划查询-->
 <select id="getXsDdDate" parameterType="java.util.HashMap" resultType="Map">

src/main/java/com/steerinfo/ems/emsgmpcjh/service/IEmsGmPcJhService.java

@@ -40,4 +40,7 @@ public interface IEmsGmPcJhService extends IBaseService<EmsGmPcJh, String>{
     PageList<Map<String, Object>>  getXsShData(HashMap<String, Object> parmas, Integer pageNum,
                                                Integer pageSize);
 
+    //每月自动生成内部计划
+    public void addNbjh();
+
 }

src/main/java/com/steerinfo/ems/emsgmpcjh/service/impl/EmsGmPcJhServiceImpl.java

@@ -1,5 +1,6 @@
 package com.steerinfo.ems.emsgmpcjh.service.impl;
 
+import com.steerinfo.ems.Utils.DateUtils;
 import com.steerinfo.ems.Utils.ExcelToolUtils;
 import com.steerinfo.ems.Utils.MarketSlmException;
 import com.steerinfo.ems.emsgmpcjh.mapper.EmsGmPcJhMapper;
@@ -20,6 +21,8 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Pattern;
@@ -387,4 +390,54 @@ public class EmsGmPcJhServiceImpl extends BaseServiceImpl<EmsGmPcJh, String> imp
         }
         return lists;
     }
+    //每个月自动生成内部计划
+    public void addNbjh(){
+        EmsGmPcJh emsGmPcJh = new EmsGmPcJh();
+        ArrayList<String> ls =  new ArrayList<>();
+        ls.add("N-G1-");
+        ls.add("N-G2-");
+        ls.add("N-X1-");
+        ls.add("N-L1-");
+        String s = DateUtils.dateStr(new Date(), "yyyy-MM-dd");
+        DateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
+        try {
+            for (String l : ls) {
+                l+= DateUtils.dateStr(new Date(),"yyyyMM")+"00-00";
+                emsGmPcJh.setPlanWeight(new BigDecimal("99999"));
+                emsGmPcJh.setKxfWeight(new BigDecimal("99999"));
+                emsGmPcJh.setYxfWeight(new BigDecimal("0"));
+                emsGmPcJh.setWorkprocType(this.setWorkprocType(l));
+                emsGmPcJh.setJhTime(dateFormat1.parse(s));
+                emsGmPcJh.setId(l);
+                emsGmPcJh.setState("2");
+                emsGmPcJhMapper.insert(emsGmPcJh);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public String setWorkprocType(String str){
+        if (str.contains("N-G1-")){
+            return "AT2005";
+        }
+        if (str.contains("N-G2-")){
+            return "AT2006";
+        }
+        if (str.contains("N-X1-")) {
+            return "AT2007";
+        }
+        if (str.contains("N-L1-")) {
+            return "AT2004";
+        }
+        return null;
+    }
+
+    public static void main(String[] args) throws ParseException {
+//
+//        System.out.println(myDate1);
+        DateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
+        Date myDate1 = dateFormat1.parse("2009-06-01");
+        System.out.println(myDate1);
+    }
 }

src/main/java/com/steerinfo/ems/emsprodplanmonth/mapper/EmsProdplanMonthMapper.java

@@ -19,7 +19,6 @@ public interface EmsProdplanMonthMapper extends IBaseMapper<EmsProdplanMonth, St
     List<Map<String, Object>> getDateLc(HashMap<String,Object> parmas);
 
     EmsProdplanMonth getBymayAndWorkprocid(HashMap<String,Object> parmas);
-
     /**
      * 获取最大的序列号
      * @return

src/main/java/com/steerinfo/ems/emsprodplanmonth/service/IEmsProdplanMonthService.java

@@ -28,6 +28,7 @@ public interface IEmsProdplanMonthService extends IBaseService<EmsProdplanMonth,
 
     public PageList<Map<String, Object>> getDateEditForPage(HashMap<String, Object> parmas, Integer pageNum,
                                                             Integer pageSize);
+
     public PageList<Map<String, Object>> getDateLc(HashMap<String, Object> parmas, Integer pageNum,
                                                             Integer pageSize);
 

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

@@ -1,8 +1,12 @@
 package com.steerinfo.ems.emsprodplanround.controller;
 
 import com.steerinfo.auth.utils.JwtUtil;
+import com.steerinfo.ems.Utils.DateUtils;
 import com.steerinfo.ems.emsgmpcjh.mapper.EmsGmPcJhMapper;
 import com.steerinfo.ems.emsgmpcjh.model.EmsGmPcJh;
+import com.steerinfo.ems.emslog.mapper.EmsLogMapper;
+import com.steerinfo.ems.emslog.model.EmsLog;
+import com.steerinfo.ems.emslog.service.IEmsLogService;
 import com.steerinfo.ems.emsprodplanmonth.mapper.EmsProdplanMonthMapper;
 import com.steerinfo.ems.emsprodplanmonth.model.EmsProdplanMonth;
 import com.steerinfo.ems.emsprodplanmonth.service.IEmsProdplanMonthService;
@@ -15,6 +19,7 @@ import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.ems.emsprodplanround.model.EmsProdplanRound;
 import com.steerinfo.ems.emsprodplanround.service.IEmsProdplanRoundService;
+import com.steerinfo.framework.utils.misc.IdGenerator;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -56,6 +61,10 @@ public class EmsProdplanRoundController extends BaseRESTfulController {
     EmsProdplanRoundMapper emsProdplanRoundMapper;
     @Autowired
     IEmsProdplanMonthService emsProdplanMonthService;
+    @Autowired
+    IEmsLogService emsLogService;
+    @Autowired
+    IdGenerator idGenerator;
     @ApiOperation(value="获取列表", notes="分页查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -87,18 +96,23 @@ public class EmsProdplanRoundController extends BaseRESTfulController {
         String userId = JwtUtil.getUseridByToken();
         String maxid = null;
         for (EmsProdplanRound model : models) {
+            if (model.getParentid() == null ){
+                return failed(null,"请点击选择左边计划!!!");
+            }
             EmsGmPcJh emsGmPcJh = emsGmPcJhMapper.selectByPrimaryKey(model.getParentid());
             if(emsGmPcJh.getState().equals("0")){
-                return failed("排产计划编号为"+emsGmPcJh.getId()+"做了取消下发操作，无法做新增操作");
+                return failed(null,"排产计划编号为"+emsGmPcJh.getId()+"做了取消下发操作，无法做新增操作");
             }
             if(model.getWorkprocType() == null || model.getWorkprocType().equals("")){
                 return  failed(null,"工序或者时间为空");
             }
             if (model.getParentid().substring(0,1).equals("G")){
                 maxid = emsProdplanRoundService.getMaxidAsGm(model);
+                model.setAscription("0");
             }
             else {
                 maxid = emsProdplanRoundService.getMaxidAsSC(model);
+                model.setAscription("1");
             }
             model.setId(maxid);
             model.setPlanWeight(model.getPlanWeight());
@@ -172,6 +186,32 @@ public class EmsProdplanRoundController extends BaseRESTfulController {
         return  success();
     }
 
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的emsProdplanRound信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "emsProdplanRound", value = "详细实体emsProdplanRound", required = true, dataType = "EmsProdplanRound")
+    })
+    //@RequiresPermissions("emsprodplanround:update")
+    @PutMapping(value = "ForcedUpdate", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult ForcedUpdate(@RequestBody EmsProdplanRound[] models) {
+        String userId = JwtUtil.getUseridByToken();
+        EmsLog emsLog =  new EmsLog();
+        for (int i = 0; i < models.length; i++) {
+            EmsProdplanRound  model = models[i];
+            model.setUpdateman(userId);
+            model.setUpdatetime(new Date());
+            String str = "{修改前的数据为:"+emsProdplanRoundMapper.selectByPrimaryKey(model.getId())+"修改后的数据为:"+model+"}";
+            emsProdplanRoundMapper.updateByPrimaryKey(model);
+            emsLog.setCode(str);
+            emsLog.setOperator(userId);
+            emsLog.setUpdatetable("ems_prodplan_round");
+            emsLog.setOperatortime(new Date());
+            emsLog.setId(idGenerator.getNextStr());
+            emsLogService.add(emsLog);
+        }
+           return  success();
+    }
+
     @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
     //@RequiresPermissions("emsprodplanround:delete")
@@ -288,19 +328,6 @@ public class EmsProdplanRoundController extends BaseRESTfulController {
     }
 
     public void updateNbjh(EmsProdplanRound emsProdplanRound) {
-        //如果是内部计划 则判断有没有轮次计划 做删除操作
-        if (emsProdplanRound.getId().substring(0,1).equals("N")) {
-            if (emsProdplanRound.getParentid() != null || !emsProdplanRound.getParentid().equals("")) {
-                Map<String,Object> map =  new HashMap();
-                map.put("parentid",emsProdplanRound.getParentid());
-                List list = emsProdplanRoundMapper.selectByParameters(map);
-                if (list.size()<1) {
-                    emsGmPcJhMapper.deleteByPrimaryKey(emsProdplanRound.getParentid());
-                }
-            }
-        }
-        //如果是外部计划 则判断有没有轮次计划 做修改操作
-        if (emsProdplanRound.getId().substring(0,1).equals("G")) {
             if (emsProdplanRound.getParentid() != null || !emsProdplanRound.getParentid().equals("")) {
                 Map<String,Object> map =  new HashMap();
                 map.put("parentid",emsProdplanRound.getParentid());
@@ -311,7 +338,6 @@ public class EmsProdplanRoundController extends BaseRESTfulController {
                      emsGmPcJhMapper.updateByPrimaryKeySelective(emsGmPcJh);
                 }
             }
-        }
     }
 
 
@@ -388,4 +414,10 @@ public class EmsProdplanRoundController extends BaseRESTfulController {
        }
        return failed();
     }
+    @GetMapping("getstdchem")
+    public RESTfulResult getstdchem(){
+        List<EmsProdplanRound> emsProdplanRounds = emsProdplanRoundService.getchemicalStandard();
+        return success(emsProdplanRounds);
+    }
+
 }

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

@@ -27,6 +27,8 @@ public interface EmsProdplanRoundMapper extends IBaseMapper<EmsProdplanRound, St
     List<EmsProdplanRound> getdimension();
     //获取表面质量标准
     List<EmsProdplanRound> getsurfaceStandard();
+    //化学成份执行标准
+    List<EmsProdplanRound> getchemicalStandard();
     //审核页面数据获取
     List<Map<String, Object>> getAuditDate(HashMap<String, Object> parmas);
     //审核

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

@@ -35,17 +35,18 @@
     <result column="AUDITSTATE" jdbcType="VARCHAR" property="auditState"/>
     <result column="GOINFO" jdbcType="VARCHAR" property="goinfo"/>
     <result column="FETCH_PLAN_WEIGHT" jdbcType="DECIMAL" property="fetchPlanWeight"/>
+    <result column="ASCRIPTION" jdbcType="VARCHAR" property="ascription"/>
   </resultMap>
   <sql id="columns">
     ID, MAY, SQNO, UNITID, DESCRIBE, STATE, GRADES, PLAN_WEIGHT, SPECIFICATIONS, LENGTHS, 
     CHEMICAL_STANDARD, SURFACE_STANDARD, MEMO, ISSUED_TIME, CREATEMAN, CREATETIME, UPDATEMAN, 
-    UPDATETIME, TRANSPORT_TYPE, PURPOSE, WORKPROC_TYPE, MSG_FLAG, READ_FLAG,PARENTID,IATERAL_AREA,LENGTH_TIMES_WIDTH,DIMENSION,STATUS,ERR_MSG,GOINFO,FETCH_PLAN_WEIGHT,DELIVERY_DATE,AUDITSTATE
+    UPDATETIME, TRANSPORT_TYPE, PURPOSE, WORKPROC_TYPE, MSG_FLAG, READ_FLAG,PARENTID,IATERAL_AREA,LENGTH_TIMES_WIDTH,DIMENSION,STATUS,ERR_MSG,GOINFO,FETCH_PLAN_WEIGHT,DELIVERY_DATE,AUDITSTATE,ASCRIPTION
   </sql>
   <sql id="columns_alias">
     t.ID, t.MAY, t.SQNO, t.UNITID, t.DESCRIBE, t.STATE, t.GRADES, t.PLAN_WEIGHT, t.SPECIFICATIONS, 
     t.LENGTHS, t.CHEMICAL_STANDARD, t.SURFACE_STANDARD, t.MEMO, t.ISSUED_TIME, t.CREATEMAN, 
     t.CREATETIME, t.UPDATEMAN, t.UPDATETIME, t.TRANSPORT_TYPE, t.PURPOSE, t.WORKPROC_TYPE, 
-    t.MSG_FLAG, t.READ_FLAG,t.PARENTID,GOINFO,FETCH_PLAN_WEIGHT
+    t.MSG_FLAG, t.READ_FLAG,t.PARENTID,GOINFO,FETCH_PLAN_WEIGHT,
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM EMS_PRODPLAN_ROUND
@@ -285,7 +286,7 @@
       MEMO, ISSUED_TIME, CREATEMAN, 
       CREATETIME, UPDATEMAN, UPDATETIME, 
       TRANSPORT_TYPE, PURPOSE, WORKPROC_TYPE,
-      MSG_FLAG, READ_FLAG,PARENTID,IATERAL_AREA,LENGTH_TIMES_WIDTH,DIMENSION,GOINFO,DELIVERY_DATE,AUDITSTATE)
+      MSG_FLAG, READ_FLAG,PARENTID,IATERAL_AREA,LENGTH_TIMES_WIDTH,DIMENSION,GOINFO,DELIVERY_DATE,AUDITSTATE,ASCRIPTION)
     values (#{id,jdbcType=VARCHAR}, #{may,jdbcType=TIMESTAMP}, #{sqno,jdbcType=DECIMAL},
       #{unitid,jdbcType=VARCHAR}, #{describe,jdbcType=VARCHAR}, #{state,jdbcType=VARCHAR}, 
       #{grades,jdbcType=VARCHAR}, #{planWeight,jdbcType=DECIMAL}, #{specifications,jdbcType=VARCHAR}, 
@@ -296,7 +297,7 @@
       #{msgFlag,jdbcType=VARCHAR}, #{readFlag,jdbcType=VARCHAR},#{parentid,jdbcType=VARCHAR},
       #{iateralArea,jdbcType=VARCHAR},#{lengthTimesWidth,jdbcType=VARCHAR},
       #{dimension,jdbcType=VARCHAR},#{goinfo,jdbcType=VARCHAR},
-      #{deliveryDate,jdbcType=TIMESTAMP},#{auditState,jdbcType=VARCHAR})
+      #{deliveryDate,jdbcType=TIMESTAMP},#{auditState,jdbcType=VARCHAR},#{ascription,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.ems.emsprodplanround.model.EmsProdplanRound">
     insert into EMS_PRODPLAN_ROUND
@@ -791,4 +792,10 @@
       and  id like '%G-%'
     </where>
   </select>
+  <select id="getchemicalStandard" resultMap="BaseResultMap">
+    select distinct CHEMICAL_STANDARD
+    from ems_prodplan_round
+   where CHEMICAL_STANDARD not like '%null%'
+  </select>
+
 </mapper>

src/main/java/com/steerinfo/ems/emsprodplanround/model/EmsProdplanRound.java

@@ -184,8 +184,18 @@ public class EmsProdplanRound implements IBasePO<String> {
     @ApiModelProperty
     private BigDecimal  fetchPlanWeight;
     //交货时间
-    @JSONField(format = "yyyy-mm-dd")
+    @JSONField(format = "yyyy-MM-dd")
     private Date deliveryDate;
+    //订单归属(0国贸 1内部)
+    private String ascription;
+
+    public String getAscription() {
+        return ascription;
+    }
+
+    public void setAscription(String ascription) {
+        this.ascription = ascription;
+    }
 
     public Date getDeliveryDate() {
         return deliveryDate;

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

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

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

@@ -79,6 +79,11 @@ public class EmsProdplanRoundServiceImpl extends BaseServiceImpl<EmsProdplanRoun
         return emsProdplanRoundMapper.getsurfaceStandard();
     }
 
+    @Override
+    public List<EmsProdplanRound> getchemicalStandard() {
+        return emsProdplanRoundMapper.getchemicalStandard();
+    }
+
     @Override
     public PageList<Map<String, Object>> getAuditDateForPage(HashMap<String, Object> parmas, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum,pageSize);

src/main/java/com/steerinfo/ems/tcm0316/mapper/TCm0316Mapper.xml

@@ -110,8 +110,11 @@
   </delete>
 
   <select id="getNameAndId" resultMap="BaseResultMap">
-  select POWERMONITORCODE, POWERMONITORNAME from T_CM_0316
-  order by POWERMONITORNAME
+   select t.powermonitorname || '-' || t1.powername as powermonitorname,
+         t.powermonitorcode
+    from t_cm_0316 t
+    left join t_cm_0325 t1
+      on t.powersystemname = t1.powercode
   </select>
 
   <!--

src/main/java/com/steerinfo/ems/trmcalpoint/controller/TRmCalpointController.java

@@ -128,6 +128,13 @@ public class TRmCalpointController extends BaseRESTfulController {
             }
             parmas.put("propertyid", propertyid);
         }
+        if(parmas.get("costid") != null && !parmas.get("costid").toString().isEmpty()){
+            String costid = parmas.get("costid").toString();
+            if(!costid.startsWith("'")){
+                costid = "'" + costid.replaceAll(",", "','").replaceAll("，", "','") + "'";
+            }
+            parmas.put("costid", costid);
+        }
         PageList<TRmCalpoint> list = tRmCalpointService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }

src/main/java/com/steerinfo/ems/trmcalpoint/mapper/TRmCalpointMapper.xml

@@ -770,7 +770,7 @@
         and UNITID = #{unitid}
       </if>
       <if test="costid != null and costid != ''">
-        and COSTID = #{costid}
+        and COSTID in (${costid})
       </if>
       <if test="tagid != null and tagid != ''">
         and TAGID = #{tagid}
@@ -923,7 +923,7 @@
         and UNITID LIKE '%${unitid}%'
       </if>
       <if test="costid != null and costid != ''">
-        and COSTID LIKE '%${costid}%'
+        and COSTID in (${costid})
       </if>
       <if test="tagid != null and tagid != ''">
         and TAGID LIKE '%${tagid}%'

src/main/java/com/steerinfo/ems/trmenergy/controller/TRmEnergyController.java

@@ -150,7 +150,7 @@ public class TRmEnergyController extends BaseRESTfulController {
                 continue;
             }
             List<Formula> list = formulaService.getByCode(Ids.get(i));
-            LOGGER.info("需要删除数据所对应的公式共" + list.size() + "条：");
+               LOGGER.info("需要删除数据所对应的公式共" + list.size() + "条：");
             for (int j = 0;j < list.size();j++){
                 LOGGER.info("该能介所对应的第" + (j + 1) + "条公式内容：" + list.get(i).toString());
             }

src/main/java/com/steerinfo/task/SpringCronTask.java

@@ -3,6 +3,7 @@ package com.steerinfo.task;
 import com.steerinfo.ems.Utils.DateUtils;
 import com.steerinfo.ems.bfhyd.service.IBfhydService;
 import com.steerinfo.ems.emsetiming.service.IEmsETimingService;
+import com.steerinfo.ems.emsgmpcjh.service.IEmsGmPcJhService;
 import com.steerinfo.ems.emswaterrealtime.service.IEmsWaterRealtimeService;
 import com.steerinfo.ems.ifemsmesactitem.service.IIfEmsMesActitemService;
 import com.steerinfo.ems.ifmesemsproductorder.service.IIfMesEmsProductorderService;
@@ -40,10 +41,8 @@ import org.springframework.scheduling.support.CronTrigger;
 import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledFuture;
 
@@ -107,6 +106,8 @@ public class SpringCronTask implements SchedulingConfigurer{
 	ITCm0318Service tCm0318Service;
 	@Autowired
 	IEmsWaterRealtimeService emsWaterRealtimeService;
+	@Autowired
+	IEmsGmPcJhService emsGmPcJhService;
 	/**
 	 * SchedulingConfigurer接口的方法实现，加载后自动运行
 	 */
@@ -284,6 +285,17 @@ public class SpringCronTask implements SchedulingConfigurer{
 					 tRmCalpointValueService.statData(new Date());
 					 logger.info("定时任务"+taskId+"执行时长：" + (new Date().getTime() - start)/1000 + "秒");
 				 }
+//				 else if (taskId.equalsIgnoreCase("124")) {
+//					 Date now = new Date();
+//					 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");
+//					 Calendar c = Calendar.getInstance();
+//					 if (c.get(Calendar.DATE) == 1) {
+//						 long start = new Date().getTime();
+//						 emsGmPcJhService.addNbjh();
+//						 logger.info("定时任务"+taskId+"执行时长：" + (new Date().getTime() - start)/1000 + "秒");
+//					 }
+//
+//				 }
 //				 else if (taskId.equalsIgnoreCase("106")) {
 //					// 获取MES水质监测数据
 //					long start = new Date().getTime();

src/main/resources/bootstrap.yml

@@ -10,11 +10,11 @@ spring:
       #默认值为0.1f，现在为了测试设置100%采集
       percentage: 1.0
   cloud:
-    config:
-      fail-fast: true
-      discovery:
-        enabled: true
-        service-id: config-server
+#    config:
+#      fail-fast: true
+#      discovery:
+#        enabled: true
+#        service-id: config-server
     bus:
       trace:
         enabled: false
@@ -26,7 +26,7 @@ server:
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.90.225}:${EUREKA_PORT:8086}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.90.238}:${EUREKA_PORT:8086}/eureka/
     metadata-map:
       cluster: ribbon
   instance: