Browse Source

应急标识

QuietShadow 3 years ago
parent
commit
01a601a4b2

+ 34 - 9
src/main/java/com/steerinfo/ems/emsgmpcjh/mapper/EmsGmPcJhMapper.xml

@@ -29,18 +29,19 @@
     <result column="YXF_WEIGHT" jdbcType="DECIMAL" property="yxfWeight" />
     <result column="DELIVERY_DATE" jdbcType="TIMESTAMP" property="deliveryDate"/>
     <result column="PLAN_WEIGHT" jdbcType="DECIMAL" property="planWeight" />
+    <result column="TAG" jdbcType="VARCHAR" property="tag" />
   </resultMap>
   <sql id="columns">
     ID, JH_TIME, STATE, GRADES, SPECIFICATIONS, LENGTHS, CHEMICAL_STANDARD, SURFACE_STANDARD, 
     WORKPROC_TYPE, IATERAL_AREA, LENGTH_TIMES_WIDTH, TRANSPORT_TYPE, RECEIVE_TIME, CREATE_MAN, 
     CREATE_TIME, UPDATE_MAN, UPDATE_TIME, MEMO, PURPOSE, UNITID, DIMENSION, KXF_WEIGHT, DELIVERY_DATE,
-    YXF_WEIGHT, PLAN_WEIGHT,GM_REVIEWER,GM_REVIEWER_TIME
+    YXF_WEIGHT, PLAN_WEIGHT,GM_REVIEWER,GM_REVIEWER_TIME,TAG
   </sql>
   <sql id="columns_alias">
     t.ID, t.JH_TIME, t.STATE, t.GRADES, t.SPECIFICATIONS, t.LENGTHS, t.CHEMICAL_STANDARD, 
     t.SURFACE_STANDARD, t.WORKPROC_TYPE, t.IATERAL_AREA, t.LENGTH_TIMES_WIDTH, t.TRANSPORT_TYPE, 
     t.RECEIVE_TIME, t.CREATE_MAN, t.CREATE_TIME, t.UPDATE_MAN, t.UPDATE_TIME, t.MEMO, 
-    t.PURPOSE, t.UNITID, t.DIMENSION, t.KXF_WEIGHT, t.YXF_WEIGHT, t.PLAN_WEIGHT
+    t.PURPOSE, t.UNITID, t.DIMENSION, t.KXF_WEIGHT, t.YXF_WEIGHT, t.PLAN_WEIGHT, t.TAG
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM EMS_GM_PC_JH
@@ -119,6 +120,9 @@
       <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="tag != null and tag != ''">
+        and TAG = #{tag}
+      </if>
       AND ID like '%G-%'
       order by  JH_TIME desc, ID asc
     </where>
@@ -197,6 +201,9 @@
       <if test="planWeight != null">
         and PLAN_WEIGHT = #{planWeight}
       </if>
+      <if test="tag != null and tag != ''">
+        and TAG LIKE '%${tag}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -275,6 +282,9 @@
       <if test="planWeight != null">
         or PLAN_WEIGHT = #{planWeight}
       </if>
+    <if test="tag != null and tag != ''">
+      or TAG = #{tag}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.ems.emsgmpcjh.model.EmsGmPcJh">
     insert into EMS_GM_PC_JH (ID, JH_TIME, STATE, 
@@ -284,7 +294,7 @@
       RECEIVE_TIME, CREATE_MAN, CREATE_TIME, 
       UPDATE_MAN, UPDATE_TIME, MEMO, 
       PURPOSE, UNITID, DIMENSION, 
-      KXF_WEIGHT, YXF_WEIGHT, PLAN_WEIGHT,DELIVERY_DATE,GM_REVIEWER,GM_REVIEWER_TIME
+      KXF_WEIGHT, YXF_WEIGHT, PLAN_WEIGHT,DELIVERY_DATE,GM_REVIEWER,GM_REVIEWER_TIME,TAG
       )
     values (#{id,jdbcType=VARCHAR}, #{jhTime,jdbcType=TIMESTAMP}, #{state,jdbcType=VARCHAR}, 
       #{grades,jdbcType=VARCHAR}, #{specifications,jdbcType=VARCHAR}, #{lengths,jdbcType=DECIMAL}, 
@@ -294,7 +304,7 @@
       #{updateMan,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{memo,jdbcType=VARCHAR}, 
       #{purpose,jdbcType=VARCHAR}, #{unitid,jdbcType=VARCHAR}, #{dimension,jdbcType=VARCHAR}, 
       #{kxfWeight,jdbcType=DECIMAL}, #{yxfWeight,jdbcType=DECIMAL}, #{planWeight,jdbcType=DECIMAL},
-      #{deliveryDate,jdbcType=TIMESTAMP},#{gmReviewer,jdbcType=VARCHAR},#{gmReviewerTime,jdbcType=TIMESTAMP}
+      #{deliveryDate,jdbcType=TIMESTAMP},#{gmReviewer,jdbcType=VARCHAR},#{gmReviewerTime,jdbcType=TIMESTAMP}, #{tag,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.ems.emsgmpcjh.model.EmsGmPcJh">
@@ -372,6 +382,9 @@
       <if test="planWeight != null">
         PLAN_WEIGHT,
       </if>
+      <if test="tag != null">
+        TAG,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -446,6 +459,9 @@
       <if test="planWeight != null">
         #{planWeight,jdbcType=DECIMAL},
       </if>
+      <if test="tag != null">
+        #{tag,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.ems.emsgmpcjh.model.EmsGmPcJh">
@@ -475,7 +491,8 @@
       PLAN_WEIGHT = #{planWeight,jdbcType=DECIMAL},
       DELIVERY_DATE   = #{deliveryDate,jdbcType=TIMESTAMP},
       GM_REVIEWER = #{gmReviewer,jdbcType=TIMESTAMP},
-      GM_REVIEWER_TIME = #{gmReviewerTime,jdbcType=TIMESTAMP}
+      GM_REVIEWER_TIME = #{gmReviewerTime,jdbcType=TIMESTAMP},
+    TAG = #{tag,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.ems.emsgmpcjh.model.EmsGmPcJh">
@@ -550,6 +567,9 @@
       <if test="planWeight != null">
         PLAN_WEIGHT = #{planWeight,jdbcType=DECIMAL},
       </if>
+      <if test="tag != null">
+        TAG = #{tag,jdbcType=VARCHAR},
+      </if>
     </set>
     where ID = #{id,jdbcType=VARCHAR}
   </update>
@@ -576,7 +596,7 @@
       CREATE_MAN, CREATE_TIME, UPDATE_MAN, 
       UPDATE_TIME, MEMO, PURPOSE, 
       UNITID, DIMENSION, KXF_WEIGHT, 
-      YXF_WEIGHT, PLAN_WEIGHT,DELIVERY_DATE)
+      YXF_WEIGHT, PLAN_WEIGHT,DELIVERY_DATE,TAG)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.id,jdbcType=VARCHAR}, 
@@ -588,7 +608,7 @@
       #{item.createMan,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateMan,jdbcType=VARCHAR}, 
       #{item.updateTime,jdbcType=TIMESTAMP}, #{item.memo,jdbcType=VARCHAR}, #{item.purpose,jdbcType=VARCHAR}, 
       #{item.unitid,jdbcType=VARCHAR}, #{item.dimension,jdbcType=VARCHAR}, #{item.kxfWeight,jdbcType=DECIMAL}, 
-      #{item.yxfWeight,jdbcType=DECIMAL}, #{item.planWeight,jdbcType=DECIMAL}, #{item.deliveryDate,jdbcType=DECIMAL} from dual
+      #{item.yxfWeight,jdbcType=DECIMAL}, #{item.planWeight,jdbcType=DECIMAL}, #{item.deliveryDate,jdbcType=DECIMAL}, #{item.tag,jdbcType=VARCHAR} from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -690,6 +710,10 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
           when #{item.id,jdbcType=VARCHAR} then #{item.planWeight,jdbcType=DECIMAL}
        </foreach>
+    ,TAG=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+      when #{item.id,jdbcType=VARCHAR} then #{item.tag,jdbcType=VARCHAR}
+    </foreach>
      where ID in 
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.id,jdbcType=VARCHAR}
@@ -776,7 +800,7 @@
 <!--              </if>-->
 <!--                and state in ('2','3')-->
 <!--            </where>-->
-    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,TAG, 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 t
@@ -863,7 +887,8 @@
        t.create_man,
        t.create_time,
        t.GM_REVIEWER,
-       t.GM_REVIEWER_TIME
+       t.GM_REVIEWER_TIME,
+    t.TAG
       from ems_gm_pc_jh t
       <where>
         <if test="startTime != null and startTime != ''  and endTime != null  and endTime != '' ">

+ 15 - 2
src/main/java/com/steerinfo/ems/emsgmpcjh/model/EmsGmPcJh.java

@@ -1,11 +1,9 @@
 package com.steerinfo.ems.emsgmpcjh.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -182,6 +180,12 @@ public class EmsGmPcJh implements IBasePO<String> {
     @JSONField(format = "yyyy-MM-dd")
     private Date deliveryDate;
 
+    /**
+     * 标识(0普通订单1应急订单)(TAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="标识(0普通订单1应急订单)",required=false)
+    private String tag;
+
     public Date getDeliveryDate() {
         return deliveryDate;
     }
@@ -413,6 +417,14 @@ public class EmsGmPcJh implements IBasePO<String> {
 
     private String endTime;
 
+    public String getTag() {
+        return tag;
+    }
+
+    public void setTag(String tag) {
+        this.tag = tag;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -443,6 +455,7 @@ public class EmsGmPcJh implements IBasePO<String> {
         sb.append(", kxfWeight=").append(kxfWeight);
         sb.append(", yxfWeight=").append(yxfWeight);
         sb.append(", planWeight=").append(planWeight);
+        sb.append(", tag=").append(tag);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

+ 7 - 0
src/main/java/com/steerinfo/ems/emsgmpcjh/service/impl/EmsGmPcJhServiceImpl.java

@@ -237,6 +237,13 @@ public class EmsGmPcJhServiceImpl extends BaseServiceImpl<EmsGmPcJh, String> imp
                         spp.setMemo(arr[j]);
                         break;
                     case "分厂" : continue;
+                    case "应急标识" :
+                        if(arr[j] != null && "应急".equals(arr[j].trim()) ) {
+                            spp.setTag("1");
+                            break;
+                        }
+                        spp.setTag("0");
+                        break;
                     default:
                         throw new MarketSlmException(500,"模板文件存在模板外的列,请仔细检查!!");
                 }

+ 23 - 1
src/main/java/com/steerinfo/ems/emsprodplanyear/controller/EmsProdplanYearController.java

@@ -208,9 +208,23 @@ public class EmsProdplanYearController extends BaseRESTfulController {
                         productid="硫铵";
                         workProcid = "AT3010";
                     }
+                    if(model.getLine().equals("AT3025")){
+                        productid="硫酸";
+                        workProcid = "AT2011";
+                    }
+                    if(model.getLine().equals("AT2012")){
+                        productid="精煤";
+                        workProcid = "AT2012";
+                    }
                     unit="008";
                     //workProcid = "AT1007";
                     break;
+                case "JJH" :
+                    sumWeight = model.getWeight().intValue();
+                    productid="精煤";
+                    workProcid = "AT2012";
+                    unit="008";
+                    break;
                 default: break;
             }
             int[] avgWeight = emsProdplanYearService.avgWeight(sumWeight,dayMax);
@@ -405,7 +419,7 @@ public class EmsProdplanYearController extends BaseRESTfulController {
                     workProcid = model.getProductid();
                     break;
                 case "JJZ" :
-                    sumWeight = model.getWeight1().intValue() + model.getWeight2().intValue();
+                    sumWeight = model.getWeight1().intValue() + model.getWeight2().intValue() - model.getWeight().intValue();
                     productid="焦炭";
                     unit="008";
                     workProcid = "AT1007";
@@ -435,6 +449,14 @@ public class EmsProdplanYearController extends BaseRESTfulController {
                         productid="硫铵";
                         workProcid = "AT3010";
                     }
+                    if(model.getLine().equals("AT3025")){
+                        productid="硫酸";
+                        workProcid = "AT2011";
+                    }
+                    if(model.getLine().equals("AT2012")){
+                        productid="精煤";
+                        workProcid = "AT2012";
+                    }
                     unit="008";
                     break;
                 default: break;