Merge branch 'master' of https://git.steerinfo.com/XTEMS/xt-ems-api

pom.xml

@@ -12,11 +12,9 @@
 	<packaging>jar</packaging>
 	<name>xt-ems-api</name>
 	<url>http://maven.apache.org</url>
-
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
-	
 	<dependencies>
 	    <!-- 
         <dependency>

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

@@ -183,6 +183,7 @@ public class EmsGmPcJhController extends BaseRESTfulController {
             EmsProdplanWeightAdjustment emsProdplanWeightAdjustment = emsProdplanWeightAdjustmentMapper.selectByPrimaryKey(model.getId());
             emsProdplanWeightAdjustment.setPlanWeight(model.getPlanWeight());
             emsProdplanWeightAdjustment.setPlanWeightOld(model.getPlanWeight());
+            emsProdplanWeightAdjustment.setRecordWeight(model.getPlanWeight());
             emsGmPcJhMapper.updateByPrimaryKey(model);
             emsProdplanWeightAdjustmentMapper.updateByPrimaryKey(emsProdplanWeightAdjustment);
         }
@@ -206,6 +207,7 @@ public class EmsGmPcJhController extends BaseRESTfulController {
                 return failed(null,"计划号为:"+model.getId()+"已经接收");
             }
             emsGmPcJhMapper.deleteByPrimaryKey(model.getId());
+            emsProdplanWeightAdjustmentMapper.deleteByPrimaryKey(model.getId());
         }
         return success();
     }
@@ -274,14 +276,23 @@ public class EmsGmPcJhController extends BaseRESTfulController {
             if (emsGmPcJh.getState().equals("3")) {
                 return failed(null,"操作失败，编号为"+emsGmPcJh.getId()+"已经接收");
             }
-            if (emsGmPcJh.getState().equals("1")) {
-                return failed(null, "操作失败，编号为" + emsGmPcJh.getId() + "正在审核");
-            }
-            model.setYxfWeight(new BigDecimal("0"));
-            model.setKxfWeight(model.getPlanWeight());
-            model.setUpdateTime(new Date());
-            model.setUpdateMan(userId);
-            emsGmPcJhService.updateState(model);
+//            if (emsGmPcJh.getState().equals("1")) {
+//                return failed(null, "操作失败，编号为" + emsGmPcJh.getId() + "正在审核");
+//            }
+            emsGmPcJh.setYxfWeight(new BigDecimal("0"));
+            emsGmPcJh.setKxfWeight(model.getPlanWeight());
+            emsGmPcJh.setState(model.getState());
+            emsGmPcJh.setUpdateTime(new Date());
+            emsGmPcJh.setSpecifications(model.getSpecifications());
+            emsGmPcJh.setGrades(model.getGrades());
+            emsGmPcJh.setLengths(model.getLengths());
+            emsGmPcJh.setPlanWeight(model.getPlanWeight());
+            emsGmPcJh.setUpdateMan(userId);
+            emsGmPcJhMapper.updateByPrimaryKey(emsGmPcJh);
+            EmsProdplanWeightAdjustment emsProdplanWeightAdjustment = emsProdplanWeightAdjustmentMapper.selectByPrimaryKey(model.getId());
+            emsProdplanWeightAdjustment.setPlanWeight(model.getPlanWeight());
+            emsProdplanWeightAdjustment.setPlanWeightOld(model.getPlanWeight());
+            emsProdplanWeightAdjustmentMapper.updateByPrimaryKey(emsProdplanWeightAdjustment);
             result = true;
             soketMessage+=emsGmPcJh.getId()+",";
         }
@@ -312,7 +323,8 @@ public class EmsGmPcJhController extends BaseRESTfulController {
             if (emsGmPcJh.getState().equals("3")) {
                 return failed(null,"操作失败，编号为"+emsGmPcJh.getId()+"已经接收");
             }
-            model.setUpdateMan(userId);
+            model.setGmReviewer(userId);
+            model.setGmReviewerTime(new Date());
             emsGmPcJhService.updateState(model);
             result = true;
             soketMessage+=emsGmPcJh.getId()+",";
@@ -342,6 +354,8 @@ public class EmsGmPcJhController extends BaseRESTfulController {
             if (emsGmPcJh.getState().equals("3")) {
                 return failed(null,"操作失败，编号为"+emsGmPcJh.getId()+"已经接收");
             }
+            model.setGmReviewer(userId);
+            model.setGmReviewerTime(new Date());
             emsGmPcJhService.updateState(model);
             result = true;
             soketMessage+=emsGmPcJh.getId()+",";
@@ -416,6 +430,13 @@ public class EmsGmPcJhController extends BaseRESTfulController {
             }
             parmas.put("workprocType", workprocType);
         }
+        if (parmas.get("state") != null && !parmas.get("state").toString().isEmpty()) {
+            String state = parmas.get("state").toString();
+            if(!state.startsWith("'")){
+                state = "'" + state.replaceAll(",", "','").replaceAll("，", "','") + "'";
+            }
+            parmas.put("state", state);
+        }
         PageList<Map<String, Object>> xsShData = emsGmPcJhService.getXsShData(parmas, pageNum, pageSize);
         return success(xsShData);
     }
@@ -438,8 +459,6 @@ public class EmsGmPcJhController extends BaseRESTfulController {
             model.setState("0");
             model.setKxfWeight(model.getPlanWeight());
             model.setYxfWeight(new BigDecimal("0"));
-            model.setUpdateTime(null);
-            model.setUpdateMan(null);
             model.setCreateTime(new Date());
             model.setCreateMan(userId);
             emsGmPcJhService.add(model);

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

@@ -17,6 +17,8 @@
     <result column="RECEIVE_TIME" jdbcType="TIMESTAMP" property="receiveTime" />
     <result column="CREATE_MAN" jdbcType="VARCHAR" property="createMan" />
     <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="GM_REVIEWER" jdbcType="VARCHAR" property="gmReviewer"/>
+    <result column="GM_REVIEWER_TIME" jdbcType="TIMESTAMP" property="gmReviewerTime"/>
     <result column="UPDATE_MAN" jdbcType="VARCHAR" property="updateMan" />
     <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="MEMO" jdbcType="VARCHAR" property="memo" />
@@ -32,7 +34,7 @@
     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
+    YXF_WEIGHT, PLAN_WEIGHT,GM_REVIEWER,GM_REVIEWER_TIME
   </sql>
   <sql id="columns_alias">
     t.ID, t.JH_TIME, t.STATE, t.GRADES, t.SPECIFICATIONS, t.LENGTHS, t.CHEMICAL_STANDARD, 
@@ -118,7 +120,7 @@
         and JH_TIME BETWEEN TO_DATE(#{startTime},'yyyy-mm-dd') AND TO_DATE(#{endTime}，'yyyy-mm-dd')
       </if>
       AND ID like '%G-%'
-      order by  JH_TIME desc, ID desc
+      order by  JH_TIME desc, ID asc
     </where>
   </sql>
   <sql id="whereLike">
@@ -282,7 +284,7 @@
       RECEIVE_TIME, CREATE_MAN, CREATE_TIME, 
       UPDATE_MAN, UPDATE_TIME, MEMO, 
       PURPOSE, UNITID, DIMENSION, 
-      KXF_WEIGHT, YXF_WEIGHT, PLAN_WEIGHT,DELIVERY_DATE
+      KXF_WEIGHT, YXF_WEIGHT, PLAN_WEIGHT,DELIVERY_DATE,GM_REVIEWER,GM_REVIEWER_TIME
       )
     values (#{id,jdbcType=VARCHAR}, #{jhTime,jdbcType=TIMESTAMP}, #{state,jdbcType=VARCHAR}, 
       #{grades,jdbcType=VARCHAR}, #{specifications,jdbcType=VARCHAR}, #{lengths,jdbcType=DECIMAL}, 
@@ -292,7 +294,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}
+      #{deliveryDate,jdbcType=TIMESTAMP},#{gmReviewer,jdbcType=VARCHAR},#{gmReviewerTime,jdbcType=TIMESTAMP}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.ems.emsgmpcjh.model.EmsGmPcJh">
@@ -471,7 +473,9 @@
       KXF_WEIGHT = #{kxfWeight,jdbcType=DECIMAL},
       YXF_WEIGHT = #{yxfWeight,jdbcType=DECIMAL},
       PLAN_WEIGHT = #{planWeight,jdbcType=DECIMAL},
-      DELIVERY_DATE   = #{deliveryDate,jdbcType=TIMESTAMP}
+      DELIVERY_DATE   = #{deliveryDate,jdbcType=TIMESTAMP},
+      GM_REVIEWER = #{gmReviewer,jdbcType=TIMESTAMP},
+      GM_REVIEWER_TIME = #{gmReviewerTime,jdbcType=TIMESTAMP}
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.ems.emsgmpcjh.model.EmsGmPcJh">
@@ -712,7 +716,23 @@
     update ems_gm_pc_jh
     <set>
       <if test="state != null and state != ''">
-        STATE = #{state}
+        STATE = #{state},
+      </if>
+<!--      <if test="grades != null and grades!= ''">-->
+<!--        GRADES = #{grades},-->
+<!--      </if>-->
+<!--      <if test="specifications != null and specifications != '' ">-->
+<!--        SPECIFICATIONS = #{specifications},-->
+<!--      </if>-->
+<!--      <if test="lengths != null and lengths != '' ">-->
+<!--        LENGTHS = #{lengths},-->
+<!--      </if>-->
+      <if test="gmReviewer != null and gmReviewer != '' ">
+        GM_REVIEWER = #{gmReviewer},
+      </if>
+
+      <if test="gmReviewerTime != null ">
+        GM_REVIEWER_TIME = #{gmReviewerTime}
       </if>
     </set>
     <where>
@@ -764,7 +784,7 @@
          t2.AUDIT_STATUS,
          t2.GM_REVIEWER,
          t2.GM_REVIEWER_TIME,
-         t2.PLAN_WEIGHT_OLD - t2.PLAN_WEIGHT TZL
+         t2.PLAN_WEIGHT - t2.PLAN_WEIGHT_OLD TZL
     from ems_gm_pc_jh t
     left join ems_prodplan_weight_adjustment t2
       on t.id = t2.id
@@ -784,7 +804,7 @@
         and t.id like '%G-%'
         and t.state = '3'
       </where>
-      order by t.jh_time desc,t.id desc
+      order by t.jh_time desc,t.id asc
 </select>
   <!--审核页面查询-->
   <select id="getShData" parameterType="java.util.HashMap" resultMap="BaseResultMap">
@@ -801,7 +821,9 @@
        t.transport_type,
        t.purpose,
        t.create_man,
-       t.create_time
+       t.create_time,
+       t.GM_REVIEWER,
+       t.GM_REVIEWER_TIME
       from ems_gm_pc_jh t
       <where>
         <if test="startTime != null and startTime != ''  and endTime != null  and endTime != '' ">
@@ -813,9 +835,12 @@
         <if test="id != null and id != '' ">
           and t.id = #{id}
         </if>
-        and t.state in ('1','2','3','4')
+        <if test="state != null and state != ''">
+          and t.state in (${state})
+        </if>
+
         and t.id like '%G-%'
       </where>
-      order by t.jh_time desc,t.id desc
+      order by t.jh_time desc,t.id asc
   </select>
 </mapper>

src/main/java/com/steerinfo/ems/emsgmpcjh/model/EmsGmPcJh.java

@@ -109,6 +109,27 @@ public class EmsGmPcJh implements IBasePO<String> {
     @ApiModelProperty(value="修改人",required=false)
     private String updateMan;
 
+    @ApiModelProperty(value = "国贸审核人",required = false)
+    private String gmReviewer;
+    @ApiModelProperty(value = "国贸审核时间",required = false)
+    private Date   gmReviewerTime;
+
+    public String getGmReviewer() {
+        return gmReviewer;
+    }
+
+    public void setGmReviewer(String gmReviewer) {
+        this.gmReviewer = gmReviewer;
+    }
+
+    public Date getGmReviewerTime() {
+        return gmReviewerTime;
+    }
+
+    public void setGmReviewerTime(Date gmReviewerTime) {
+        this.gmReviewerTime = gmReviewerTime;
+    }
+
     /**
      * 修改时间(UPDATE_TIME,TIMESTAMP,7)
      */

src/main/java/com/steerinfo/ems/emsprodplanweightadjustment/controller/EmsProdplanWeightAdjustmentController.java

@@ -124,11 +124,6 @@ public class EmsProdplanWeightAdjustmentController extends BaseRESTfulController
         EmsProdplanWeightAdjustment emsProdplanWeightAdjustment;
         for (EmsProdplanWeightAdjustment model : models) {
             emsProdplanWeightAdjustment = emsProdplanWeightAdjustmentMapper.selectByPrimaryKey(model.getId());
-            System.out.println(models.length);
-            System.out.println(emsProdplanWeightAdjustment);
-            if (emsProdplanWeightAdjustment.getAuditStatus().equals("1")) {
-                return failed(null,"编号为"+emsProdplanWeightAdjustment.getId()+",已经提交申请,请勿重复操作");
-            }
             if (emsProdplanWeightAdjustment.getAuditStatus().equals("2")) {
                 return failed(null,"编号为"+emsProdplanWeightAdjustment.getId()+",领导部门已经审批,请勿重复操作");
             }
@@ -138,7 +133,6 @@ public class EmsProdplanWeightAdjustmentController extends BaseRESTfulController
             emsProdplanWeightAdjustment.setSubmitter(userId);
             emsProdplanWeightAdjustment.setSubmitTime(new Date());
             emsProdplanWeightAdjustment.setAuditStatus(model.getAuditStatus());
-            emsProdplanWeightAdjustment.setRecordWeight(emsProdplanWeightAdjustment.getPlanWeight());
             emsProdplanWeightAdjustment.setPlanWeight(model.getPlanWeight());
             emsProdplanWeightAdjustmentMapper.updateByPrimaryKey(emsProdplanWeightAdjustment);
             result = true;
@@ -249,12 +243,12 @@ public class EmsProdplanWeightAdjustmentController extends BaseRESTfulController
                     return failed(null,"计划编号为:"+emsProdplanWeightAdjustment.getId()+",审核失败,请勿重复操作");
                 }
                 EmsGmPcJh emsGmPcJh = emsGmPcJhMapper.selectByPrimaryKey(model.getId());
-                emsGmPcJh.setPlanWeight(emsProdplanWeightAdjustment.getPlanWeight());
                 emsProdplanWeightAdjustment.setReviewer(userId);
                 emsProdplanWeightAdjustment.setReviewerTime(new Date());
+                emsProdplanWeightAdjustment.setRecordWeight(emsGmPcJh.getPlanWeight());
                 emsProdplanWeightAdjustment.setAuditStatus("3");
-                emsProdplanWeightAdjustment.setPlanWeightOld(emsProdplanWeightAdjustment.getRecordWeight());
                 emsProdplanWeightAdjustmentMapper.updateByPrimaryKey(emsProdplanWeightAdjustment);
+                emsGmPcJh.setPlanWeight(emsProdplanWeightAdjustment.getPlanWeight());
                 emsGmPcJhMapper.updateByPrimaryKey(emsGmPcJh);
 //                result = true;
 //                soketMessage+=model.getId()+",";
@@ -290,10 +284,12 @@ public class EmsProdplanWeightAdjustmentController extends BaseRESTfulController
                 if(emsProdplanWeightAdjustment.getAuditStatus().equals("4")){
                     return failed(null,"计划编号为:"+emsProdplanWeightAdjustment.getId()+",审核失败,请勿重复操作");
                 }
-                emsProdplanWeightAdjustment.setPlanWeight(emsProdplanWeightAdjustment.getPlanWeightOld());
+                EmsGmPcJh emsGmPcJh = emsGmPcJhMapper.selectByPrimaryKey(model.getId());
+                emsGmPcJh.setPlanWeight(emsProdplanWeightAdjustment.getRecordWeight());
+                emsGmPcJhMapper.updateByPrimaryKey(emsGmPcJh);
                 emsProdplanWeightAdjustment.setReviewer(userId);
                 emsProdplanWeightAdjustment.setReviewerTime(new Date());
-                emsProdplanWeightAdjustment.setAuditStatus("4");
+                emsProdplanWeightAdjustment.setAuditStatus("2");
                 emsProdplanWeightAdjustmentMapper.updateByPrimaryKey(emsProdplanWeightAdjustment);
             }
         }

src/main/java/com/steerinfo/ems/tcm035/controller/TCm035Controller.java

@@ -131,7 +131,6 @@ public class TCm035Controller extends BaseRESTfulController {
     //@RequiresPermissions("tcm035:update")
     @PutMapping(value = "/submit/")
     public RESTfulResult submit(@ModelAttribute MultipartFile[] file, TCm035 model, String del){
-    	System.out.println(del);
     	if (model == null) {
     		return failed(null, "参数错误！");
     	}