Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java

@@ -26,9 +26,9 @@ import java.util.List;
  */
 @Api(tags = "欠款提车申请")
 @FeignClient(
-        contextId = "bus-BusArrearsCarryVehicleApply",
+        contextId = "anrui-buscenter-BusArrearsCarryVehicleApply",
-        name = "bus",
+        name = "anrui-buscenter",
-        path = "v1/busarrearscarryvehicleapply",
+        path = "busarrearscarryvehicleapply",
         fallback = BusArrearsCarryVehicleApplyFeignFallback.class)
 public interface BusArrearsCarryVehicleApplyFeign {
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java

@@ -65,6 +65,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.portal.api.sysuser.UserQuery;
 import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -72,9 +73,7 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.message.*;
-import com.yxt.messagecenter.api.message.MessageFlowVo;
-import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -681,6 +680,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
 
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(bv.getUserSid()).getData();
         BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(bv.getBusinessSid());
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
@@ -709,6 +709,52 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
                 messageFlowableQuery.setMsgContent(busAdvanceGinvoiceapply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                 messageFlowableQuery.setMsgTitle("提前开票申请");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+            } else {
+                AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery();
+                Map<String, Object> appMaps = new HashMap<>();
+                appMaps.put("contractSid", busAdvanceGinvoiceapply.getSid());
+                List<String> recipientSidList = new ArrayList<>();
+
+                // 风控中心总经理角色用户
+                UserRoleQuery userRoleQuery = new UserRoleQuery();
+                userRoleQuery.setRoleSid("537bea8f-75e8-430c-9a5f-3140bda41f39");
+                List<SysUserVo> list1 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
+                for (SysUserVo userVo : list1) {
+                    recipientSidList.add(userVo.getSid());
+                }
+                // 分公司会计角色用户
+                UserQuery userQuery = new UserQuery();
+                userQuery.setRoleSid("94e3e298-e934-42d2-af02-50e93eee583a");
+                userQuery.setOrgSidPath(bv.getOrgSidPath());
+                List<SysUserVo> list = sysUserFeign.getUserByRole(userQuery).getData();
+                for (SysUserVo userVo : list) {
+                    recipientSidList.add(userVo.getSid());
+                }
+                //财务中心总经理角色用户
+                UserRoleQuery userRoleQuery3 = new UserRoleQuery();
+                userRoleQuery3.setRoleSid("b2bcdfd6-ac51-408c-9c7a-7e9818d23155");
+                List<SysUserVo> list3 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery3).getData();
+                for (SysUserVo userVo : list3) {
+                    recipientSidList.add(userVo.getSid());
+                }
+                //事业部运营经理角色用户
+                UserRoleQuery userRoleQuery2 = new UserRoleQuery();
+                userRoleQuery2.setRoleSid("f60b30b0-c7ad-4533-8367-b3ff95cbe725");
+                List<SysUserVo> list2 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery2).getData();
+                for (SysUserVo userVo : list2) {
+                    recipientSidList.add(userVo.getSid());
+                }
+                query.setRecipientSidList(recipientSidList);
+                query.setAppMap(appMaps);
+                query.setMsgTitle("业务");
+                query.setMsgContent(sysUserVo.getName() + "提交的提前开票申请,请查阅");
+                query.setMsgSource("业务");
+                query.setMsgTargetUri(MsgTargetUriEnum.TQKPSQTS.getUri());
+                query.setApp_type("2");
+                query.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
+                query.setName("业务");
+                // 消息推送
+                messageFeign.sendAutoserviceMessage(query);
             }
             return rb.success().setData(resultBean.getData());
         } else {

anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue

@@ -127,9 +127,9 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="24" class="tlineheightb">
             <el-form-item>
-              <span>注：若能确定车架号,则选择是,进入选择车架号页面选定车架号。若暂时确定不了,则选择否，则直接推送客户名称+手机号码的客户信息到财务系统,款项操作再次客户名下进行。</span>
+              <span>注：若能确定车架号,则选择是,进入选择车架号页面选定车架号。若暂时确定不了,则选择否，则直接推送客户名称+手机号码的客户信息到财务系统,款项操作在此客户名下进行。</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -333,7 +333,7 @@ export default {
         this.$refs['divVehicle'].showData(this.multipleSelection[0].name, this.multipleSelection[0].sid)
       }
       if (this.isTerminal === '0') {
-        const tip = '已经创建：(' + this.multipleSelection[0].name + ':' + this.multipleSelection[0].mobile + ')的金蝶客户,请到金蝶系统中进行处理。'
+        const tip = '已经创建：(' + this.multipleSelection[0].name + this.multipleSelection[0].mobile + ')的金蝶客户,请到金蝶系统中进行处理。'
         this.$confirm(tip, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '关闭',
@@ -393,4 +393,17 @@ export default {
 }
 </script>
 <style scoped>
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
 </style>

anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/vehicleSelect.vue

@@ -247,6 +247,7 @@ export default {
           sendFinCustomerTrue(this.sids).then((res) => {
             if (res.success) {
               this.$message({ showClose: true, type: 'success', message: '推送成功' })
+              this.handleReturn()
             }
           })
         })

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java

@@ -143,11 +143,11 @@ public class BdMaterialService extends FinKingDeeService {
             draftFCategoryId(map_fEntityModel_);
             ResultBean<String> draft = draft(kingDeeData);
             String data = draft.getData();
-            ResultBean<String> submit = submit(KingDeeBillId.BD_MATERIAL.getID(),data);
+            String id = draftResultGetId(data);
+            ResultBean<String> submit = submit(KingDeeBillId.BD_MATERIAL.getID(),id);
             if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setData(submit.getData());
-            ResultBean<String> audit = audit(KingDeeBillId.BD_MATERIAL.getID(),data);
+            ResultBean<String> audit = audit(KingDeeBillId.BD_MATERIAL.getID(),id);
             if (!audit.getSuccess()) return rb.setCode(KingDeeCode.AUDIT.getCode()).setData(audit.getData());
-            String id = draftResultGetId(draft.getData());
             ResultBean<String> allocate = allocate(KingDeeBillId.BD_MATERIAL.getID(),id, map_fEntityModel_.get("TOrgIds"));
             if (!allocate.getSuccess()) return rb.setCode(KingDeeCode.ALLOCATE.getCode()).setData(allocate.getData());
             return draft;

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -217,8 +217,7 @@ public class FlowableRest implements FlowableFeign {
         String nextUserSid = dto.getNextNodeUserSids();
         if(StringUtils.isBlank(nextUserSid)){
             ResultBean<UserAndOrgPath> nextNodeUserSidsOfSubmit = getNextNodeUserSidsOfSubmit(dto);
-            if (!nextNodeUserSidsOfSubmit.getSuccess()|| nextNodeUserSidsOfSubmit.getData()==null
+            if (!nextNodeUserSidsOfSubmit.getSuccess()) {
-                    || StringUtils.isBlank(nextNodeUserSidsOfSubmit.getData().getUserSid())) {
                 return rb.setMsg("nextUserSid 不能为空！");
             }
             nextUserSid=nextNodeUserSidsOfSubmit.getData().getUserSid();
@@ -265,10 +264,10 @@ public class FlowableRest implements FlowableFeign {
             log.error("formVariables:{}",JSON.toJSONString(formVariables));
             taskService.setAssignee(taskId, userSid);
             //formVariables.remove("userSid");
-            for(Map.Entry<String, Object> entry:formVariables.entrySet()){
+            /*for(Map.Entry<String, Object> entry:formVariables.entrySet()){
                 taskService.setVariable(taskId,entry.getKey(),entry.getValue());
                 System.out.println(entry.getKey()+"--->"+entry.getValue());
-            }
+            }*/
             taskService.complete(taskId, formVariables);
             //根据流程实例的id取最新的待办环节，给环节设置上用户sid
             ResultBean<List<LatestTaskVo>> ll = flowtaskService.getLatestTasksNew(instanceId);
@@ -284,6 +283,7 @@ public class FlowableRest implements FlowableFeign {
                     System.out.println(entry.getKey()+"--->"+entry.getValue());
                 }*/
                // taskService.setVariables(id_,formVariables);
+                //在act_ru_variable表中增加环节上的业务参数的变量
                 taskService.setVariablesLocal(id_,formVariables);
                 nodeState = latestTaskVo.getName_();
                 taskDefKey = latestTaskVo.getTask_def_key_();
@@ -391,6 +391,7 @@ public class FlowableRest implements FlowableFeign {
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
+        String orgPath = resultBean.getData().get(0).getOrgPath();
         String nodeState = resultBean.getData().get(0).getName_();
         String taskDefKey = resultBean.getData().get(0).getTask_def_key_();
         String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef();
@@ -402,6 +403,10 @@ public class FlowableRest implements FlowableFeign {
        /* if (incomingSourceRef.contains("start")) {
             vo.setNodeState( SysFormLinkFlowStateEnum.REJECT.getCode());
         }*/
+        Map<String, Object> formVariables=new HashMap<>();
+        formVariables.put("orgPath",orgPath);
+        //在act_ru_variable表中增加环节上的业务参数的变量
+        taskService.setVariablesLocal(taskId,formVariables);
         ResultBean resultBean1 = ResultBean.fireSuccess();
         return resultBean1.success().setData(vo);
     }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserQuery.java

@@ -18,6 +18,4 @@ public class UserQuery implements Query {
     @ApiModelProperty(value = "用户部门sid路径是必传项")
     private String orgSidPath;
 
-    @ApiModelProperty(value = "机构sid",required = false)
-    private String orgPath;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthInfoVo.java

@@ -14,6 +14,8 @@ public class AppScmVehInventorymonthInfoVo implements Vo {
 
     @ApiModelProperty("本次应盘数量")
     private String totalNumber;
+    @ApiModelProperty("本次未盘库数量")
+    private String surplusNumber;
     @ApiModelProperty("实际盘库数量")
     private String actualNumber;
     @ApiModelProperty("正常数量")
@@ -30,6 +32,8 @@ public class AppScmVehInventorymonthInfoVo implements Vo {
     private String lossRemarks;
     @ApiModelProperty("盘损备注")
     private String damageRemarks;
+    @ApiModelProperty("未盘库备注")
+    private String surplusNumberRemarks;
     @ApiModelProperty("接收人")
     private String recipient;
     @ApiModelProperty("创建日期")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreport.java

@@ -58,5 +58,7 @@ public class ScmVehInventoryreport extends BaseEntity {
     private String receiverNames; // 接收人姓名
 	@ApiModelProperty("盘库报告内容")
     private String reportContent; // 盘库报告内容
+    @ApiModelProperty("未盘原因")
+    private String reason;
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportDto.java

@@ -59,5 +59,7 @@ public class ScmVehInventoryreportDto implements Dto {
     private List<RecipientListDto> recipientList;
     @ApiModelProperty("盘库报告内容")
     private String reportContent; // 盘库报告内容
+    @ApiModelProperty("未盘原因")
+    private String reason;
 
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java

@@ -129,7 +129,7 @@ public interface ScmVehicleInventoryMapper extends BaseMapper<ScmVehicleInventor
     @Select(" select InventoryDate as lastDate,InventoryName as lastName from scm_vehicle_inventory where vinNo = #{vin}  and id &lt; #{ids} and createOrgSid = #{createOrgSid} ORDER BY id DESC")
     List<ScmVehicleStayInventoryVo> selInventory(@Param("vin") String vin, @Param("ids") String ids, @Param("createOrgSid") String createOrgSid);
 
-    @Select("select count(*) from scm_vehicle_inventory svi where svi.useOrgSid = #{useOrgSid} and InventoryState = '无' ")
+    @Select("select count(*) from scm_vehicle_inventory svi where svi.useOrgSid = #{useOrgSid} and InventoryState = '无' and isDelete = 0 ")
     int getInventoryState(@Param("useOrgSid") String useOrgSid);
 
     AppVehInventorymonthVo getMonthByMainSid(@Param("mainSid") String mainSid);
@@ -143,4 +143,6 @@ public interface ScmVehicleInventoryMapper extends BaseMapper<ScmVehicleInventor
 
     List<AppScmVehicleCarInventoryListPageVo> getInventoryAll(String useOrgSid);
 
+    @Update("update scm_vehicle_inventory set isDelete = 1 where mainSid = #{mainSid}")
+    void updateByManSid(@Param("mainSid") String mainSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.scm.biz.scmvehicleinventory;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.nacos.api.config.filter.IFilterConfig;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
@@ -55,6 +56,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -243,17 +245,19 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         List<AppScmVehicleStayInventoryListPageVo> records = iPage.getRecords();
         for (AppScmVehicleStayInventoryListPageVo record : records) {
             List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = baseMapper.selectInventory(record.getVin(), record.getId(), record.getCreateOrgSid());
-            if (scmVehicleStayInventoryVos.size() <= 0) {
+            if (scmVehicleStayInventoryVos.removeAll(Collections.singleton(null))) {
-                record.setInventoryDate("无");
+                if (scmVehicleStayInventoryVos.size() <= 0) {
-            } else {
+                    record.setInventoryDate("无");
-                ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0);
+                } else {
-                record.setInventoryDate(simpleDateFormat.format(scmVehicleStayInventoryVo.getLastDate()));
+                    ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0);
-            }
+                    record.setInventoryDate(simpleDateFormat.format(scmVehicleStayInventoryVo.getLastDate()));
-            if (scmVehicleStayInventoryVos.size() <= 0) {
+                }
-                record.setInventoryName("无");
+                if (scmVehicleStayInventoryVos.size() <= 0) {
-            } else {
+                    record.setInventoryName("无");
-                ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0);
+                } else {
-                record.setInventoryName(scmVehicleStayInventoryVo.getLastName());
+                    ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0);
+                    record.setInventoryName(scmVehicleStayInventoryVo.getLastName());
+                }
             }
         }
         return iPage;
@@ -302,18 +306,20 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         AppScmVehicleStayInventoryInfoVo vo = baseMapper.getInventory(recordSid);
 //        List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = baseMapper.selInventory(vin, ids, createOrgSid);
         List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = baseMapper.selectInventory(vo.getVin(), vo.getId(), vo.getCreateOrgSid());
-        if (scmVehicleStayInventoryVos.size() > 0) {
+        if (scmVehicleStayInventoryVos.removeAll(Collections.singleton(null))) {
-            if (scmVehicleStayInventoryVos == null) {
+            if (scmVehicleStayInventoryVos.size() > 0) {
-                vo.setLastData("无");
+                if (scmVehicleStayInventoryVos == null) {
-            } else {
+                    vo.setLastData("无");
-                ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0);
+                } else {
-                vo.setLastData(simpleDateFormat.format(scmVehicleStayInventoryVo.getLastDate()));
+                    ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0);
-            }
+                    vo.setLastData(simpleDateFormat.format(scmVehicleStayInventoryVo.getLastDate()));
-            if (scmVehicleStayInventoryVos == null) {
+                }
-                vo.setLastName("无");
+                if (scmVehicleStayInventoryVos == null) {
-            } else {
+                    vo.setLastName("无");
-                ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0);
+                } else {
-                vo.setLastName(scmVehicleStayInventoryVo.getLastName());
+                    ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0);
+                    vo.setLastName(scmVehicleStayInventoryVo.getLastName());
+                }
             }
         }
         List<ScmFile> scmFiles = scmFileService.selectByLinkSid(recordSid, type);
@@ -647,4 +653,8 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
     public List<AppScmVehicleCarInventoryListPageVo> getInventoryAll(String useOrgSid) {
         return baseMapper.getInventoryAll(useOrgSid);
     }
+
+    public void updateByManSid(String mainSid) {
+        baseMapper.updateByManSid(mainSid);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml

@@ -50,7 +50,8 @@
     <select id="selByMainSid"
             resultType="com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthInfoVo">
         SELECT receiverNames                       as recipient,
-               DATE_FORMAT(createTime, '%Y-%m-%d') AS `date`
+               DATE_FORMAT(createTime, '%Y-%m-%d') AS `date`,
+               reason                              as  surplusNumberRemarks
         FROM scm_veh_inventoryreport
         WHERE mainSid = #{sid}
     </select>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java

@@ -291,11 +291,7 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
             record.setProfitNumber(String.valueOf(vo.getProfitNumber()));
             record.setActualNumber(String.valueOf(vo.getProfitNumber() + vo.getNormalNumber() + vo.getDamageNumber() + vo.getLossNumber()));
             if (record.getState() == 0) {
-                if (vo.getSurplusNumber() == 0) {
+                record.setShowBtn(true);
-                    record.setShowBtn(true);
-                } else {
-                    record.setShowBtn(false);
-                }
             } else {
                 record.setShowBtn(false);
             }
@@ -348,6 +344,8 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
         vo.setNormalNumber(String.valueOf(appScmVehInventorymonthVo.getNormalNumber()));
         //本次应盘数量
         vo.setTotalNumber(String.valueOf(appScmVehInventorymonthVo.getTotalNumber()));
+        //本次未盘库数量
+        vo.setSurplusNumber(String.valueOf(appScmVehInventorymonthVo.getSurplusNumber()));
 
         String inventoryStateKey1 = "003";
         String inventoryStateKey2 = "004";
@@ -376,6 +374,9 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
         if (StringUtils.isNotBlank(damageRemark)) {
             vo.setDamageRemarks(damageRemark.substring(0, damageRemark.length() - 2));
         }
+        if (appScmVehInventorymonthInfoVo != null) {
+            vo.setSurplusNumberRemarks(appScmVehInventorymonthInfoVo.getSurplusNumberRemarks());
+        }
         return rb.success().setData(vo);
     }
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java

@@ -32,7 +32,9 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthInfoQuery;
 import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthInfoVo;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonth;
 import com.yxt.anrui.scm.api.scmvehinventoryreport.*;
+import com.yxt.anrui.scm.biz.scmvehicleinventory.ScmVehicleInventoryService;
 import com.yxt.anrui.scm.biz.scmvehinventorymonth.ScmVehInventorymonthService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -76,6 +78,8 @@ public class ScmVehInventoryreportService extends MybatisBaseService<ScmVehInven
     @Autowired
     ScmVehInventorymonthService scmVehInventorymonthService;
     @Autowired
+    ScmVehicleInventoryService scmVehicleInventoryService;
+    @Autowired
     private MessageFeign messageFeign;
     @Autowired
     private MessageTypeFeign messageTypeFeign;
@@ -140,9 +144,13 @@ public class ScmVehInventoryreportService extends MybatisBaseService<ScmVehInven
         AppScmVehInventorymonthInfoQuery appScmVehInventorymonthInfoQuery = new AppScmVehInventorymonthInfoQuery();
         appScmVehInventorymonthInfoQuery.setSid(dto.getMainSid());
         appScmVehInventorymonthInfoQuery.setUserSid(dto.getUserSid());
+
         AppScmVehInventorymonthInfoVo data = scmVehInventorymonthService.getCarInventoryReport(appScmVehInventorymonthInfoQuery).getData();
         scmVehInventoryreport.setReportContent(data.getProfitRemarks() + data.getLossRemarks() + data.getDamageRemarks());
+        scmVehInventoryreport.setReason(dto.getReason());
+
         scmVehInventorymonthService.updateByMainSid(dto.getMainSid());
+
         List<RecipientListDto> recipientList = dto.getRecipientList();
         String receiverNames = "";
         String receiverSids = "";
@@ -154,7 +162,7 @@ public class ScmVehInventoryreportService extends MybatisBaseService<ScmVehInven
         scmVehInventoryreport.setReceiverSids(receiverSids.substring(0, receiverSids.length() - 1));
         scmVehInventoryreport.setCreateBySid(dto.getUserSid());
         save(scmVehInventoryreport);
-
+        scmVehicleInventoryService.updateByManSid(dto.getMainSid());
         List<String> recipientSidList = new ArrayList<>();
         for (RecipientListDto recipientListDto : recipientList) {
             recipientSidList.add(recipientListDto.getSid());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java

@@ -66,10 +66,7 @@ import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspection
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -161,21 +158,25 @@ public class ScmVehPatrolinspectionreportService extends MybatisBaseService<ScmV
 
         StringBuilder question = new StringBuilder();
 
-        for (AppVinAndRemarksVo remark : questions1) {
+        if (questions1.removeAll(Collections.singleton(null))) {
-            // 问题未解决
+            for (AppVinAndRemarksVo remark : questions1) {
-            question.append(remark.getVinNo());
+                // 问题未解决
-            question.append("：");
+                question.append(remark.getVinNo());
-            question.append(remark.getRemarks());
+                question.append("：");
-            question.append("（问题已反馈）");
+                question.append(remark.getRemarks());
-            question.append("\n");
+                question.append("（问题已反馈）");
+                question.append("\n");
+            }
         }
-        for (AppVinAndRemarksVo remark : questions2) {
+        if (questions1.removeAll(Collections.singleton(null))) {
-            // 问题已解决
+            for (AppVinAndRemarksVo remark : questions2) {
-            question.append(remark.getVinNo());
+                // 问题已解决
-            question.append("：");
+                question.append(remark.getVinNo());
-            question.append(remark.getRemarks());
+                question.append("：");
-            question.append("（问题已解决）");
+                question.append(remark.getRemarks());
-            question.append("\n");
+                question.append("（问题已解决）");
+                question.append("\n");
+            }
         }
         List<AppLiableListDto> liableList = dto.getList();
         String DutyName = "";

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventorymonthInfoVo.java

@@ -13,6 +13,8 @@ public class VehInventorymonthInfoVo implements Vo {
 
     @ApiModelProperty("本次应盘数量")
     private String totalNumber;
+    @ApiModelProperty("本次未盘数量")
+    private String surplusNumber;
     @ApiModelProperty("实际盘库数量")
     private String actualNumber;
     @ApiModelProperty("正常数量")
@@ -29,6 +31,8 @@ public class VehInventorymonthInfoVo implements Vo {
     private String lossRemarks;
     @ApiModelProperty("盘损备注")
     private String damageRemarks;
+    @ApiModelProperty("未盘库备注")
+    private String surplusNumberRemarks;
     @ApiModelProperty("接收人")
     private String recipient;
     @ApiModelProperty("创建日期")