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

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

@@ -56,7 +56,6 @@ public class EmsGmPcJhController extends BaseRESTfulController {
     @Autowired
     EmsProdplanWeightAdjustmentMapper emsProdplanWeightAdjustmentMapper;
 
-
     @ApiOperation(value="获取列表", notes="分页查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -264,6 +263,8 @@ public class EmsGmPcJhController extends BaseRESTfulController {
     //@RequiresPermissions("emsgmpcjh:update")
     @PutMapping(value = "/submitaudit", produces  = "application/json;charset=UTF-8")
     public RESTfulResult submitaudit(@RequestBody EmsGmPcJh[] models){
+        String soketMessage="国贸订单编号";
+        boolean result = false;
         String userId = JwtUtil.getUseridByToken();
         for (EmsGmPcJh model : models) {
             EmsGmPcJh emsGmPcJh = this.emsGmPcJhMapper.selectByPrimaryKey(model.getId());
@@ -274,20 +275,34 @@ public class EmsGmPcJhController extends BaseRESTfulController {
                 return failed(null,"操作失败，编号为"+emsGmPcJh.getId()+"已经接收");
             }
             if (emsGmPcJh.getState().equals("1")) {
-                return failed(null,"操作失败，编号为"+emsGmPcJh.getId()+"正在审核");
+                return failed(null, "操作失败，编号为" + emsGmPcJh.getId() + "正在审核");
             }
             model.setYxfWeight(new BigDecimal("0"));
             model.setKxfWeight(model.getPlanWeight());
             model.setUpdateTime(new Date());
             model.setUpdateMan(userId);
-
             emsGmPcJhService.updateState(model);
+            result = true;
+            soketMessage+=emsGmPcJh.getId()+",";
         }
+            if(result){
+                soketMessage += "已提交审核,请注意接收";
+                String[] roles = {"国贸-部门领导"};
+                Map <String, Object> map = new HashMap<String,Object>();
+                map.put("role",roles);
+                map.put("title","国贸订单审核");
+                map.put("message",soketMessage);
+                map.put("tips","您好，有新的国贸计划已提交审核,请注意接收。");
+                soketMessage= JSON.toJSONString(map);
+                webSocket.sendAllMessage(soketMessage);
+            }
         return success();
     }
 //@RequiresPermissions("emsgmpcjh:update")
     @PutMapping(value = "/passaudits", produces  = "application/json;charset=UTF-8")
     public RESTfulResult passaudits(@RequestBody EmsGmPcJh[] models){
+        String soketMessage="国贸订单编号";
+        boolean result = false;
         String userId = JwtUtil.getUseridByToken();
         for (EmsGmPcJh model : models) {
             EmsGmPcJh emsGmPcJh = this.emsGmPcJhMapper.selectByPrimaryKey(model.getId());
@@ -299,6 +314,19 @@ public class EmsGmPcJhController extends BaseRESTfulController {
             }
             model.setUpdateMan(userId);
             emsGmPcJhService.updateState(model);
+            result = true;
+            soketMessage+=emsGmPcJh.getId()+",";
+            if(result){
+                soketMessage += "下发,请注意接收";
+                String[] roles = {"生产部-生产处"};
+                Map <String, Object> map = new HashMap<String,Object>();
+                map.put("role",roles);
+                map.put("title","国贸订单下发");
+                map.put("message",soketMessage);
+                map.put("tips","您好，有新的国贸计划已经下发,请注意接收。");
+                soketMessage= JSON.toJSONString(map);
+                webSocket.sendAllMessage(soketMessage);
+            }
         }
         return success();
     }
@@ -307,12 +335,27 @@ public class EmsGmPcJhController extends BaseRESTfulController {
     @PutMapping(value = "/turndown", produces  = "application/json;charset=UTF-8")
     public RESTfulResult turndown(@RequestBody EmsGmPcJh[] models){
         String userId = JwtUtil.getUseridByToken();
+        String soketMessage="国贸订单编号";
+        boolean result = false;
         for (EmsGmPcJh model : models) {
             EmsGmPcJh emsGmPcJh = this.emsGmPcJhMapper.selectByPrimaryKey(model.getId());
             if (emsGmPcJh.getState().equals("3")) {
                 return failed(null,"操作失败，编号为"+emsGmPcJh.getId()+"已经接收");
             }
             emsGmPcJhService.updateState(model);
+            result = true;
+            soketMessage+=emsGmPcJh.getId()+",";
+            if(result){
+                soketMessage += "已被撤回,请注意查看";
+                String[] roles = {"国贸-业务人员"};
+                Map <String, Object> map = new HashMap<String,Object>();
+                map.put("role",roles);
+                map.put("title","国贸订单审核");
+                map.put("message",soketMessage);
+                map.put("tips","您好，您提交的订单已被撤回,请注意查看。");
+                soketMessage= JSON.toJSONString(map);
+                webSocket.sendAllMessage(soketMessage);
+            }
         }
         return success();
     }
@@ -341,6 +384,20 @@ public class EmsGmPcJhController extends BaseRESTfulController {
     })
     @GetMapping("/getXsDdDate")
     public RESTfulResult getXsDdDate(@RequestParam HashMap<String,Object> parmas,Integer pageNum,Integer pageSize){
+     if(parmas.get("workprocType") != null && !parmas.get("workprocType").toString().isEmpty()){
+         String workprocType = parmas.get("workprocType").toString();
+         if(!workprocType.startsWith("'")){
+             workprocType = "'" + workprocType.replaceAll(",", "','").replaceAll("，", "','") + "'";
+         }
+         parmas.put("workprocType", workprocType);
+     }
+     if(parmas.get("auditStatus") != null && !parmas.get("auditStatus").toString().isEmpty()){
+         String auditStatus = parmas.get("auditStatus").toString();
+         if(!auditStatus.startsWith("'")){
+             auditStatus = "'" + auditStatus.replaceAll(",", "','").replaceAll("，", "','") + "'";
+         }
+         parmas.put("auditStatus", auditStatus);
+     }
         PageList<Map<String, Object>>  getXsDdDateForPage= emsGmPcJhService.getXsDdDate(parmas, pageNum, pageSize);
         return success(getXsDdDateForPage);
     }

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

@@ -291,7 +291,8 @@
       #{receiveTime,jdbcType=TIMESTAMP}, #{createMan,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{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}
+      #{kxfWeight,jdbcType=DECIMAL}, #{yxfWeight,jdbcType=DECIMAL}, #{planWeight,jdbcType=DECIMAL},
+      #{deliveryDate,jdbcType=TIMESTAMP}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.ems.emsgmpcjh.model.EmsGmPcJh">
@@ -757,10 +758,12 @@
          t2.plan_weight,
          t2.plan_weight_old,
          t2.submitter,
-         to_char(t2.submit_time,'yyyy-mm-dd') submit_time,
+         t2.submit_time,
          t2.reviewer,
-         to_char(t2.reviewer_time,'yyyy-mm-dd') reviewer_time,
+         t2.reviewer_time,
          t2.AUDIT_STATUS,
+         t2.GM_REVIEWER,
+         t2.GM_REVIEWER_TIME,
          t2.PLAN_WEIGHT_OLD - t2.PLAN_WEIGHT TZL
     from ems_gm_pc_jh t
     left join ems_prodplan_weight_adjustment t2
@@ -772,9 +775,16 @@
         <if test="startTime != null and startTime != '' and endTime != null and endTime != '' ">
           and t.jh_time between to_date(#{startTime}, 'yyyy-mm-dd') and to_date(#{endTime}, 'yyyy-mm-dd')
         </if>
+        <if test="auditStatus != null and auditStatus != '' ">
+          and t2.AUDIT_STATUS in (${auditStatus})
+        </if>
+        <if test="workprocType != null and workprocType!= '' ">
+          and WORKPROC_TYPE in (${workprocType})
+        </if>
         and t.id like '%G-%'
         and t.state = '3'
       </where>
+      order by t.jh_time desc,t.id desc
 </select>
   <!--审核页面查询-->
   <select id="getShData" parameterType="java.util.HashMap" resultMap="BaseResultMap">

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

@@ -1,6 +1,8 @@
 package com.steerinfo.ems.emsprodplanweightadjustment.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.steerinfo.auth.utils.JwtUtil;
+import com.steerinfo.ems.Utils.WebSocket;
 import com.steerinfo.ems.emsgmpcjh.mapper.EmsGmPcJhMapper;
 import com.steerinfo.ems.emsgmpcjh.model.EmsGmPcJh;
 import com.steerinfo.ems.emsprodplanweightadjustment.mapper.EmsProdplanWeightAdjustmentMapper;
@@ -44,7 +46,8 @@ public class EmsProdplanWeightAdjustmentController extends BaseRESTfulController
     EmsProdplanWeightAdjustmentMapper emsProdplanWeightAdjustmentMapper;
     @Autowired
     EmsGmPcJhMapper emsGmPcJhMapper;
-
+    @Autowired
+    private WebSocket webSocket;
     @ApiOperation(value="获取列表", notes="分页查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -119,93 +122,183 @@ public class EmsProdplanWeightAdjustmentController extends BaseRESTfulController
     @PutMapping(value = "/submitaudit",produces = "application/json;charset=UTF-8")
     public RESTfulResult submitaudit(@RequestBody EmsProdplanWeightAdjustment[] models){
         String userId = JwtUtil.getUseridByToken();
+        String soketMessage="国贸订单编号";
+        boolean result = false;
         for (EmsProdplanWeightAdjustment model : models) {
             EmsProdplanWeightAdjustment emsProdplanWeightAdjustment = emsProdplanWeightAdjustmentMapper.selectByPrimaryKey(model.getId());
             if (emsProdplanWeightAdjustment.getAuditStatus().equals("1")) {
-                return failed(null,"领导部门还未审批,请勿重复操作");
+                return failed(null,"编号为"+emsProdplanWeightAdjustment.getId()+",已经提交申请,请勿重复操作");
             }
             if (emsProdplanWeightAdjustment.getAuditStatus().equals("2")) {
-                return failed(null,"该计划领导部门已经审批,请勿重复操作");
+                return failed(null,"编号为"+emsProdplanWeightAdjustment.getId()+",领导部门已经审批,请勿重复操作");
             }
             if (emsProdplanWeightAdjustment.getAuditStatus().equals("3")) {
-                return failed(null,"该计划生产部已经同意,请勿重复操作");
+                return failed(null,"编号为"+emsProdplanWeightAdjustment.getId()+",生产部已经同意,请勿重复操作");
             }
             emsProdplanWeightAdjustment.setSubmitter(userId);
-            emsProdplanWeightAdjustment.setReviewerTime(new Date());
+            emsProdplanWeightAdjustment.setSubmitTime(new Date());
             emsProdplanWeightAdjustment.setAuditStatus(model.getAuditStatus());
             emsProdplanWeightAdjustment.setRecordWeight(emsProdplanWeightAdjustment.getPlanWeight());
             emsProdplanWeightAdjustment.setPlanWeight(model.getPlanWeight());
             emsProdplanWeightAdjustmentMapper.updateByPrimaryKey(emsProdplanWeightAdjustment);
+            result = true;
+            soketMessage+=model.getId()+",";
+            if(result){
+                soketMessage += "已提交审核,请注意接收";
+                String[] roles = {"生产部-生产处"};
+                Map <String, Object> map = new HashMap<String,Object>();
+                map.put("role",roles);
+                map.put("title","销售订单调整");
+                map.put("message",soketMessage);
+                map.put("tips","您好，有新的销售订单需要进行重量调整,请注意接收。");
+                soketMessage= JSON.toJSONString(map);
+                webSocket.sendAllMessage(soketMessage);
+            }
         }
             return success(null,"提交成功");
     }
-
     @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的emsProdplanWeightAdjustment信息来更新详细信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "emsProdplanWeightAdjustment", value = "详细实体emsProdplanWeightAdjustment", required = true, dataType = "EmsProdplanWeightAdjustment")
     })
-    @PutMapping(value = "approval/{id}", produces  = "application/json;charset=UTF-8")
-    public RESTfulResult approval(@PathVariable String id){
-        EmsProdplanWeightAdjustment emsProdplanWeightAdjustment = emsProdplanWeightAdjustmentMapper.selectByPrimaryKey(id);
-        if (emsProdplanWeightAdjustment != null ) {
-           if (emsProdplanWeightAdjustment.getAuditStatus().equals("2")) {
-               return failed(null,"该计划领导部门已经审批,请勿重复操作");
-           }
-           if (emsProdplanWeightAdjustment.getAuditStatus().equals("3")) {
-               return failed(null,"该计划生产部已经审批,请勿重复操作");
-           }
-           if(emsProdplanWeightAdjustment.getAuditStatus().equals("4")){
-               return failed(null,"该计划审核失败,请勿重复操作");
-           }
-            emsProdplanWeightAdjustment.setAuditStatus("2");
-            emsProdplanWeightAdjustmentMapper.updateByPrimaryKey(emsProdplanWeightAdjustment);
+    @PutMapping(value = "approval", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult approval(@RequestBody EmsProdplanWeightAdjustment[] models ){
+        String userId = JwtUtil.getUseridByToken();
+        for (EmsProdplanWeightAdjustment model : models) {
+            EmsProdplanWeightAdjustment emsProdplanWeightAdjustment = emsProdplanWeightAdjustmentMapper.selectByPrimaryKey(model.getId());
+            if (emsProdplanWeightAdjustment != null ) {
+                if (emsProdplanWeightAdjustment.getAuditStatus().equals("2")) {
+                    return failed(null,"计划编号为:"+emsProdplanWeightAdjustment.getId()+",部门已经审批,请勿重复操作");
+                }
+                if (emsProdplanWeightAdjustment.getAuditStatus().equals("0")) {
+                    return failed(null,"计划编号为:"+emsProdplanWeightAdjustment.getId()+",先提交审核,请勿重复操作");
+                }
+                if (emsProdplanWeightAdjustment.getAuditStatus().equals("3")) {
+                    return failed(null,"计划编号为:"+emsProdplanWeightAdjustment.getId()+",生产部已经审批,请勿重复操作");
+                }
+                if(emsProdplanWeightAdjustment.getAuditStatus().equals("4")){
+                    return failed(null,"计划编号为:"+emsProdplanWeightAdjustment.getId()+",计划审核失败,请勿重复操作");
+                }
+                emsProdplanWeightAdjustment.setAuditStatus("2");
+                emsProdplanWeightAdjustment.setGmReviewer(userId);
+                emsProdplanWeightAdjustment.setGmReviewerTime(new Date());
+                emsProdplanWeightAdjustmentMapper.updateByPrimaryKey(emsProdplanWeightAdjustment);
+            }
         }
         return success();
     }
 
-    @PutMapping(value = "agreement/{id}", produces  = "application/json;charset=UTF-8")
-    public RESTfulResult agreement(@PathVariable String id){
-        EmsProdplanWeightAdjustment emsProdplanWeightAdjustment = emsProdplanWeightAdjustmentMapper.selectByPrimaryKey(id);
-        if (emsProdplanWeightAdjustment != null ) {
-            if (emsProdplanWeightAdjustment.getAuditStatus().equals("0")) {
-                return failed(null,"该计划还未走审批流程,操作失败");
-            }
-            if (emsProdplanWeightAdjustment.getAuditStatus().equals("1")) {
-                return failed(null,"领导部门还未审批,操作失败");
-            }
-            if (emsProdplanWeightAdjustment.getAuditStatus().equals("3")) {
-                return failed(null,"该计划生产部已经审批,请勿重复操作");
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的emsProdplanWeightAdjustment信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "emsProdplanWeightAdjustment", value = "详细实体emsProdplanWeightAdjustment", required = true, dataType = "EmsProdplanWeightAdjustment")
+    })
+    @PutMapping(value = "nopass", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult nopass(@RequestBody EmsProdplanWeightAdjustment[] models ){
+        String userId = JwtUtil.getUseridByToken();
+        String soketMessage="国贸订单编号";
+        boolean result = false;
+        for (EmsProdplanWeightAdjustment model : models) {
+            EmsProdplanWeightAdjustment emsProdplanWeightAdjustment = emsProdplanWeightAdjustmentMapper.selectByPrimaryKey(model.getId());
+            if (emsProdplanWeightAdjustment != null ) {
+                if (emsProdplanWeightAdjustment.getAuditStatus().equals("3")) {
+                    return failed(null,"计划编号为:"+emsProdplanWeightAdjustment.getId()+",生产部已经审批,请勿重复操作");
+                }
+                if(emsProdplanWeightAdjustment.getAuditStatus().equals("4")){
+                    return failed(null,"计划编号为:"+emsProdplanWeightAdjustment.getId()+",计划审核失败,请勿重复操作");
+                }
+                emsProdplanWeightAdjustment.setGmReviewer(userId);
+                emsProdplanWeightAdjustment.setGmReviewerTime(new Date());
+                emsProdplanWeightAdjustment.setAuditStatus("0");
+                emsProdplanWeightAdjustmentMapper.updateByPrimaryKey(emsProdplanWeightAdjustment);
+                result = true;
+                soketMessage+=model.getId()+",";
+                if(result){
+                    soketMessage += "不通过,请注意查看";
+                    String[] roles = {"国贸-业务人员"};
+                    Map <String, Object> map = new HashMap<String,Object>();
+                    map.put("role",roles);
+                    map.put("title","销售订单重量调整");
+                    map.put("message",soketMessage);
+                    map.put("tips","您好，有提交的订单不通过，请注意查看。");
+                    soketMessage= JSON.toJSONString(map);
+                    webSocket.sendAllMessage(soketMessage);
+                }
             }
-            if(emsProdplanWeightAdjustment.getAuditStatus().equals("4")){
-                return failed(null,"该计划审核失败,请勿重复操作");
+        }
+                 return success();
+    }
+
+    @PutMapping(value = "agreement", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult agreement(@RequestBody EmsProdplanWeightAdjustment[] models){
+        String userId = JwtUtil.getUseridByToken();
+//        String soketMessage="国贸订单编号";
+//        boolean result = false;
+        for (EmsProdplanWeightAdjustment model : models) {
+            EmsProdplanWeightAdjustment emsProdplanWeightAdjustment = emsProdplanWeightAdjustmentMapper.selectByPrimaryKey(model.getId());
+            if (emsProdplanWeightAdjustment != null ) {
+                if (emsProdplanWeightAdjustment.getAuditStatus().equals("0")) {
+                    return failed(null,"计划编号为:"+emsProdplanWeightAdjustment.getId()+",还未走审批流程,操作失败");
+                }
+                if (emsProdplanWeightAdjustment.getAuditStatus().equals("1")) {
+                    return failed(null,"计划编号为:"+emsProdplanWeightAdjustment.getId()+",领导部门还未审批,操作失败");
+                }
+                if (emsProdplanWeightAdjustment.getAuditStatus().equals("3")) {
+                    return failed(null,"计划编号为:"+emsProdplanWeightAdjustment.getId()+",该计划生产部已经审批,请勿重复操作");
+                }
+                if(emsProdplanWeightAdjustment.getAuditStatus().equals("4")){
+                    return failed(null,"计划编号为:"+emsProdplanWeightAdjustment.getId()+",审核失败,请勿重复操作");
+                }
+                EmsGmPcJh emsGmPcJh = emsGmPcJhMapper.selectByPrimaryKey(model.getId());
+                emsGmPcJh.setPlanWeight(emsProdplanWeightAdjustment.getPlanWeight());
+                emsProdplanWeightAdjustment.setReviewer(userId);
+                emsProdplanWeightAdjustment.setReviewerTime(new Date());
+                emsProdplanWeightAdjustment.setAuditStatus("3");
+                emsProdplanWeightAdjustment.setPlanWeightOld(emsProdplanWeightAdjustment.getRecordWeight());
+                emsProdplanWeightAdjustmentMapper.updateByPrimaryKey(emsProdplanWeightAdjustment);
+                emsGmPcJhMapper.updateByPrimaryKey(emsGmPcJh);
+//                result = true;
+//                soketMessage+=model.getId()+",";
+//                if(result){
+//                    soketMessage += "已通过,请注意查看";
+//                    String[] roles = {"国贸-部门领导"};
+//                    Map <String, Object> map = new HashMap<String,Object>();
+//                    map.put("role",roles);
+//                    map.put("title","销售订单重量调整");
+//                    map.put("message",soketMessage);
+//                    map.put("tips","您好，有提交的订单不通过，请注意查看。");
+//                    soketMessage= JSON.toJSONString(map);
+//                    webSocket.sendAllMessage(soketMessage);
+//                }
             }
-            EmsGmPcJh emsGmPcJh = emsGmPcJhMapper.selectByPrimaryKey(id);
-            emsGmPcJh.setPlanWeight(emsProdplanWeightAdjustment.getPlanWeight());
-            emsProdplanWeightAdjustment.setAuditStatus("3");
-            emsProdplanWeightAdjustment.setPlanWeightOld(emsProdplanWeightAdjustment.getRecordWeight());
-            emsProdplanWeightAdjustmentMapper.updateByPrimaryKey(emsProdplanWeightAdjustment);
-            emsGmPcJhMapper.updateByPrimaryKey(emsGmPcJh);
+
         }
+
             return success();
     }
-    @PutMapping(value = "rejected/{id}", produces  = "application/json;charset=UTF-8")
-    public RESTfulResult rejected(@PathVariable String id){
-        EmsProdplanWeightAdjustment emsProdplanWeightAdjustment = emsProdplanWeightAdjustmentMapper.selectByPrimaryKey(id);
-        if (emsProdplanWeightAdjustment != null ) {
-            if (emsProdplanWeightAdjustment.getAuditStatus().equals("0")) {
-                return failed(null,"该计划还未走审批流程,操作失败");
-            }
-            if (emsProdplanWeightAdjustment.getAuditStatus().equals("1")) {
-                return failed(null, "领导部门还未审批,操作失败");
-            }
-            if(emsProdplanWeightAdjustment.getAuditStatus().equals("4")){
-                return failed(null,"该计划审核失败,请勿重复操作");
+    @PutMapping(value = "rejected", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult rejected(@RequestBody EmsProdplanWeightAdjustment[] models){
+        String userId = JwtUtil.getUseridByToken();
+        for (EmsProdplanWeightAdjustment model : models) {
+            EmsProdplanWeightAdjustment emsProdplanWeightAdjustment = emsProdplanWeightAdjustmentMapper.selectByPrimaryKey(model.getId());
+            if (emsProdplanWeightAdjustment != null ) {
+                if (emsProdplanWeightAdjustment.getAuditStatus().equals("0")) {
+                    return failed(null,"计划编号为:"+emsProdplanWeightAdjustment.getId()+",还未走审批流程,操作失败");
+                }
+                if (emsProdplanWeightAdjustment.getAuditStatus().equals("1")) {
+                    return failed(null, "计划编号为:"+emsProdplanWeightAdjustment.getId()+",领导部门还未审批,操作失败");
+                }
+                if(emsProdplanWeightAdjustment.getAuditStatus().equals("4")){
+                    return failed(null,"计划编号为:"+emsProdplanWeightAdjustment.getId()+",审核失败,请勿重复操作");
+                }
+                emsProdplanWeightAdjustment.setPlanWeight(emsProdplanWeightAdjustment.getPlanWeightOld());
+                emsProdplanWeightAdjustment.setReviewer(userId);
+                emsProdplanWeightAdjustment.setReviewerTime(new Date());
+                emsProdplanWeightAdjustment.setAuditStatus("4");
+                emsProdplanWeightAdjustmentMapper.updateByPrimaryKey(emsProdplanWeightAdjustment);
+
             }
-            emsProdplanWeightAdjustment.setPlanWeight(emsProdplanWeightAdjustment.getPlanWeightOld());
-            emsProdplanWeightAdjustment.setAuditStatus("4");
-            emsProdplanWeightAdjustmentMapper.updateByPrimaryKey(emsProdplanWeightAdjustment);
         }
-            return success();
+        return success();
     }
 
 }

src/main/java/com/steerinfo/ems/emsprodplanweightadjustment/mapper/EmsProdplanWeightAdjustmentMapper.xml

@@ -11,10 +11,12 @@
     <result column="REVIEWER_TIME" jdbcType="TIMESTAMP" property="reviewerTime" />
     <result column="AUDIT_STATUS" jdbcType="VARCHAR" property="auditStatus" />
     <result column="RECORD_WEIGHT" jdbcType="DECIMAL" property="recordWeight"/>
+    <result column="GM_REVIEWER" jdbcType="VARCHAR" property="gmReviewer"/>
+    <result column="GM_REVIEWER_TIME" jdbcType="TIMESTAMP" property="gmReviewerTime"/>
   </resultMap>
   <sql id="columns">
     ID, PLAN_WEIGHT, PLAN_WEIGHT_OLD, SUBMITTER, SUBMIT_TIME, REVIEWER, REVIEWER_TIME, 
-    AUDIT_STATUS,RECORD_WEIGHT
+    AUDIT_STATUS,RECORD_WEIGHT,GM_REVIEWER,GM_REVIEWER_TIME
   </sql>
   <sql id="columns_alias">
     t.ID, t.PLAN_WEIGHT, t.PLAN_WEIGHT_OLD, t.SUBMITTER, t.SUBMIT_TIME, t.REVIEWER, t.REVIEWER_TIME, 
@@ -114,10 +116,11 @@
   <insert id="insert" parameterType="com.steerinfo.ems.emsprodplanweightadjustment.model.EmsProdplanWeightAdjustment">
     insert into EMS_PRODPLAN_WEIGHT_ADJUSTMENT (ID, PLAN_WEIGHT, PLAN_WEIGHT_OLD, 
       SUBMITTER, SUBMIT_TIME, REVIEWER, 
-      REVIEWER_TIME, AUDIT_STATUS,RECORD_WEIGHT)
+      REVIEWER_TIME, AUDIT_STATUS,RECORD_WEIGHT,GM_REVIEWER,GM_REVIEWER_TIME)
     values (#{id,jdbcType=VARCHAR}, #{planWeight,jdbcType=DECIMAL}, #{planWeightOld,jdbcType=DECIMAL}, 
       #{submitter,jdbcType=VARCHAR}, #{submitTime,jdbcType=TIMESTAMP}, #{reviewer,jdbcType=VARCHAR}, 
-      #{reviewerTime,jdbcType=TIMESTAMP}, #{auditStatus,jdbcType=VARCHAR},#{recordWeight,jdbcType=DECIMAL})
+      #{reviewerTime,jdbcType=TIMESTAMP}, #{auditStatus,jdbcType=VARCHAR},#{recordWeight,jdbcType=DECIMAL},
+      #{gmReviewer,jdbcType=VARCHAR},#{gmReviewerTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.ems.emsprodplanweightadjustment.model.EmsProdplanWeightAdjustment">
     insert into EMS_PRODPLAN_WEIGHT_ADJUSTMENT
@@ -183,7 +186,9 @@
       REVIEWER = #{reviewer,jdbcType=VARCHAR},
       REVIEWER_TIME = #{reviewerTime,jdbcType=TIMESTAMP},
       AUDIT_STATUS = #{auditStatus,jdbcType=VARCHAR},
-      RECORD_WEIGHT = #{recordWeight,jdbcType=DECIMAL}
+      RECORD_WEIGHT = #{recordWeight,jdbcType=DECIMAL},
+      GM_REVIEWER = #{gmReviewer,jdbcType=VARCHAR},
+      GM_REVIEWER_TIME = #{gmReviewerTime,jdbcType=TIMESTAMP}
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.ems.emsprodplanweightadjustment.model.EmsProdplanWeightAdjustment">

src/main/java/com/steerinfo/ems/emsprodplanweightadjustment/model/EmsProdplanWeightAdjustment.java

@@ -60,6 +60,27 @@ public class EmsProdplanWeightAdjustment implements IBasePO<String> {
     @ApiModelProperty(value = "保留上一次重量",required = false)
     private BigDecimal recordWeight;
 
+    @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;
+    }
+
     public BigDecimal getRecordWeight() {
         return recordWeight;
     }

src/main/java/com/steerinfo/feigen/service/LgWeightFeigenService.java

@@ -13,7 +13,9 @@ import java.util.Date;
 import java.util.List;
 
 @FeignClient("xt-ems-datasource")
+@Component
 public interface LgWeightFeigenService {
+
     @GetMapping("v1/lgweight/queryWeightByTime")
     public List<LgWeight> QueryWeightByTime();
 

src/main/java/com/steerinfo/ftp/uploadfile/controller/UploadFileController.java

@@ -40,7 +40,6 @@ import java.util.*;
 @RestController
 @RequestMapping("/${api.version}/uploadfiles")
 public class UploadFileController extends BaseRESTfulController {
-
     @Autowired
     IUploadFileService uploadFileService;
     @Autowired