出库

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppSubmitDeliveredApplyDto.java

@@ -8,8 +8,6 @@ import lombok.Data;
 public class AppSubmitDeliveredApplyDto extends AppDeliveredApplyDto {
     private static final long serialVersionUID = -1742176484192196029L;
 
-    @ApiModelProperty("意见")
-    private String comment;
     @ApiModelProperty("流程实例id")
     @JsonProperty("procInsId")
     private String instanceId;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java

@@ -90,10 +90,10 @@ public interface BusDeliveredApplyFeign {
      * @param dto
      * @return
      */
-    @ApiOperation("提交")
+ /*   @ApiOperation("提交")
     @PostMapping("/submit")
-//    @ResponseBody
-    ResultBean submit(@RequestBody BusDeliveredApplyDto dto);
+    @ResponseBody
+    ResultBean submit(@RequestBody BusDeliveredApplyDto dto);*/
 
     /**
      * 列表上的提交
@@ -101,10 +101,10 @@ public interface BusDeliveredApplyFeign {
      * @param sid 出库申请sid
      * @return
      */
-    @ApiOperation("列表上的提交")
+/*    @ApiOperation("列表上的提交")
     @PutMapping("/submitBySid")
 //    @ResponseBody
-    ResultBean submitBySid(@RequestParam(value = "sid") String sid);
+    ResultBean submitBySid(@RequestParam(value = "sid") String sid);*/
 
     /**
      * 列表上的撤回
@@ -112,10 +112,10 @@ public interface BusDeliveredApplyFeign {
      * @param sid 出库申请sid
      * @return
      */
-    @ApiOperation("列表上的撤回")
+  /*  @ApiOperation("列表上的撤回")
     @PutMapping("/revokeBySid")
-//    @ResponseBody
-    ResultBean revokeBySid(@RequestParam(value = "sid") String sid);
+    @ResponseBody
+    ResultBean revokeBySid(@RequestParam(value = "sid") String sid);*/
 
     /**
      * 编辑初始化/详情
@@ -148,10 +148,6 @@ public interface BusDeliveredApplyFeign {
     @ResponseBody
     public ResultBean submitDeliveredApply(@Valid @RequestBody SubmitDeliveredApplyDto dto);
 
-    @ApiOperation("App-提交出库审批流程")
-    @PostMapping("/submitAppDeliveredApply")
-    @ResponseBody
-    public ResultBean submitAppDeliveredApply(@Valid @RequestBody AppSubmitDeliveredApplyDto dto);
 
     @ApiOperation(value = "办理（同意）")
     @PostMapping("/complete")
@@ -191,6 +187,9 @@ public interface BusDeliveredApplyFeign {
      @ResponseBody
      public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@PathVariable("sid") String sid);
  */
+
+    /***************************************APP******************************************/
+
     @ApiOperation("手机端-初始化 出库申请")
     @GetMapping("/getRetrievalApplyInfoBySid")
     @ResponseBody
@@ -201,4 +200,9 @@ public interface BusDeliveredApplyFeign {
     @ResponseBody
     public ResultBean saveRetrievalApplyInfo(@RequestBody AppDeliveredApplyDto appDeliveredApplyDto);
 
+    @ApiOperation("App-提交出库审批流程")
+    @PostMapping("/submitAppDeliveredApply")
+    @ResponseBody
+    public ResultBean submitAppDeliveredApply(@Valid @RequestBody AppSubmitDeliveredApplyDto dto);
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java

@@ -64,7 +64,7 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
         return ResultBean.fireFail().setMsg("接口anrui-buscenter/busdeliveredapply/delBySids无法访问");
     }
 
-    @Override
+  /*  @Override
     public ResultBean submit(BusDeliveredApplyDto dto) {
         return null;
     }
@@ -77,7 +77,7 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
     @Override
     public ResultBean revokeBySid(String sid) {
         return null;
-    }
+    }*/
 
     @Override
     public ResultBean<BusDeliveredApplyDetailVo> fetchDetailsBySid(BusDeliveredApplyDetailQuery query) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java

@@ -27,17 +27,15 @@ package com.yxt.anrui.buscenter.biz.busdelivered;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.buscenter.api.busdelivered.*;
-import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyVo;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-import javax.xml.ws.Action;
 import java.util.List;
 
 /**
@@ -90,4 +88,6 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
     List<AppVinListVo> selVinListVo(@Param("contractNo") String contractNo, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw);
 
     AppCarListVo getDeliveredPice(@Param("vin") String vin);
+
+    int updateStateByContractNo(@Param("contractNo") String contractNo, @Param("list") List<String> vinSidList, @Param("state") int i);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@@ -83,4 +83,11 @@
         set state = #{state}
         where vinNo = #{vinNo}
     </update>
+
+    <update id="updateStateByContractNo">
+        update bus_delivered set state = #{state} where contractNo = #{contractNo} and busVinSid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@@ -389,6 +389,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             if (busDeliveredApply == null) {
                 return rb.setMsg("该出库申请不存在");
             }
+            appDeliveredDetailsVo.setSid(query.getOutboundSid());
             BeanUtil.copyProperties(busDeliveredApply, appDeliveredDetailsVo, "sid");
             appDeliveredDetailsVo.setContractId(busDeliveredApply.getContractNo());
             appDeliveredDetailsVo.setPublishInfo(busDeliveredApply.getApplyDept() + "-" + busDeliveredApply.getApplyName());
@@ -500,4 +501,9 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
         save(busDelivered);
         return rb.success();
     }
+
+    public int updateStateByContractNo(String contractNo, List<String> vinSidList, int i) {
+        return baseMapper.updateStateByContractNo(contractNo, vinSidList, i);
+    }
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java

@@ -100,4 +100,8 @@ public interface BusDeliveredApplyMapper extends BaseMapper<BusDeliveredApply> {
      * @return
      */
     IPage<AppDeliveredApplyPageVo> getRetrievalApplyList(IPage<AppDeliveredApplyPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppDeliveredApplyPageQuery> qw, @Param("name") String name);
+
+    List<String> selectVinNo(@Param("contractId") String contractId, @Param("list") List<String> vinSid);
+
+    String selectNum(String billNo);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml

@@ -5,15 +5,15 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyVo">
         SELECT bd.sid,
-        if(length(bd.nodeState) > 0, nodeState, '待提交') as nodeState,
-        bd.contractNo,
-        bd.name,
-        bd.taskId,
-        bd.procInstId,
-        bd.procDefId,
-        DATE_FORMAT(bd.applyDate, '%Y-%m-%d') as applyDate,
-        bd.applyName,
-        bd.modelName
+               if(length(bd.nodeState) > 0, nodeState, '待提交') as nodeState,
+               bd.contractNo,
+               bd.name,
+               bd.taskId,
+               bd.procInstId,
+               bd.procDefId,
+               DATE_FORMAT(bd.applyDate, '%Y-%m-%d')          as applyDate,
+               bd.applyName,
+               bd.modelName
         FROM bus_delivered_apply bd
         <where>
             ${ew.sqlSegment}
@@ -22,12 +22,12 @@
 
     <update id="updateStateBySid">
         update bus_delivered_apply
-        set state     = #{state}
+        set state = #{state}
         where sid = #{sid}
     </update>
 
     <select id="selectState" resultType="java.lang.Boolean">
-        select if(length(nodeState) > 0, 'false','true')
+        select if(length(nodeState) > 0, 'false', 'true')
         from bus_delivered_apply where sid in
         <foreach item="sid" collection="sidsList" open="(" separator="," close=")">
             #{sid}
@@ -37,24 +37,26 @@
     <select id="getRetrievalApplyList"
             resultType="com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageVo">
         SELECT bd.sid,
-        if(length(bd.nodeState) > 0, nodeState, '待提交') as contractState,
-        if(length(bd.nodeState) > 0, false, true) as showUpdata,
-        if(length(bd.nodeState) > 0, false, true) as showDelete,
-        bd.contractNo as contractId,
-        bd.applyName,
-        bd.name as customerName,
-        DATE_FORMAT(bd.createTime, '%Y-%m-%d') as `date`,
-        (select CONCAT_WS(',',group_concat(vinNo)) from bus_delivered_apply_details bss where bss.applySid = bd.sid) as vinNo
+               if(length(bd.nodeState) > 0, nodeState, '待提交') as contractState,
+               if(length(bd.nodeState) > 0, false, true)      as showUpdata,
+               if(length(bd.nodeState) > 0, false, true)      as showDelete,
+               bd.contractNo                                  as contractId,
+               bd.applyName,
+               bd.name                                        as customerName,
+               DATE_FORMAT(bd.createTime, '%Y-%m-%d')         as `date`,
+               (select CONCAT_WS(',', group_concat(vinNo))
+                from bus_delivered_apply_details bss
+                where bss.applySid = bd.sid)                  as vinNo
         FROM bus_delivered_apply bd
         <where>
             ${ew.sqlSegment}
             <if test="name != null and name != ''">
                 and concat(IFNULL(bd.contractNo
-                , '')
-                , ifnull(bd.`name`
-                , '')) LIKE concat('%'
-                , #{name}
-                , '%')
+                  , '')
+                  , ifnull(bd.`name`
+                  , '')) LIKE concat('%'
+                  , #{name}
+                  , '%')
             </if>
         </where>
         order by bd.id desc
@@ -76,7 +78,7 @@
     <update id="updateFlowFiled">
         UPDATE bus_delivered_apply
         SET nodeState=#{nodeState}
-        , nodeId=#{taskDefKey}
+          , taskDefKey=#{taskDefKey}
         <if test="procDefId != null and procDefId != ''">
             , procDefId=#{procDefId}
         </if>
@@ -88,4 +90,24 @@
         </if>
         WHERE sid = #{sid}
     </update>
+
+    <select id="selectVinNo" resultType="java.lang.String">
+        select bv.linkNo
+        from bus_delivered bd
+                 left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid
+        where bd.contractNo = #{contractId}
+          and bd.state = 0
+          and bv.linkSid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT(billNo, 4)
+        from bus_delivered_apply
+        where billNo LIKE concat(#{billNo}, '%')
+        order by billNo desc
+        limit 1
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java

@@ -95,39 +95,39 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
         return busDeliveredApplyService.delete(sids);
     }
 
-    /**
+  /*  *//**
      * 提交申请
      *
      * @param dto 数据传输对象
      * @return
-     */
+     *//*
     @Override
     public ResultBean submit(BusDeliveredApplyDto dto) {
         return busDeliveredApplyService.submit(dto);
     }
 
-    /**
+    *//**
      * 出库申请管理列表的提交
      *
      * @param sid 出库申请sid
      * @return
-     */
+     *//*
     @Override
     public ResultBean submitBySid(String sid) {
         return busDeliveredApplyService.submitBySid(sid);
     }
 
-    /**
+    *//**
      * 出库申请管理列表的撤回
      *
      * @param sid 出库申请sid
      * @return
-     */
+     *//*
     @Override
     public ResultBean revokeBySid(String sid) {
         return busDeliveredApplyService.revokeBySid(sid);
     }
-
+*/
 
     /**
      * 初始化/详情

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.commoncontract.CommonContract;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
+import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.*;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetails;
@@ -267,7 +268,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
      * @param dto 数据传输对象
      * @return
      */
-    public ResultBean submit(BusDeliveredApplyDto dto) {
+   /* public ResultBean submit(BusDeliveredApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         ResultBean resultBean = saveOrUpdateDto(dto);
         if (resultBean.getSuccess()) {
@@ -278,7 +279,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             return rb.success().setMsg("提交成功");
         }
         return rb.setMsg(resultBean.getMsg());
-    }
+    }*/
 
     /**
      * 出库申请列表的提交
@@ -286,7 +287,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
      * @param sid 出库申请sid
      * @return
      */
-    public ResultBean submitBySid(String sid) {
+   /* public ResultBean submitBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();
         BusDeliveredApply busDeliveredApply = fetchBySid(sid);
         if (busDeliveredApply == null) {
@@ -295,7 +296,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         //状态：1待提交，2待审核，3已通过，4未通过
         baseMapper.updateStateBySid(2, sid);
         return rb.success().setMsg("提交成功");
-    }
+    }*/
 
     /**
      * 出库申请管理列表的撤回
@@ -303,7 +304,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
      * @param sid 出库申请sid
      * @return
      */
-    public ResultBean revokeBySid(String sid) {
+  /*  public ResultBean revokeBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();
         BusDeliveredApply busDeliveredApply = fetchBySid(sid);
         if (busDeliveredApply == null) {
@@ -315,7 +316,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }
         baseMapper.updateStateBySid(1, sid);
         return rb.success().setMsg("撤回成功");
-    }
+    }*/
 
     /**
      * 删除
@@ -789,6 +790,18 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             busDeliveredApply.setStaffDeptSid(deptSid);
             busDeliveredApply.setStaffUserSid(userSid);
             busDeliveredApply.setStaffName(userVoResultBean.getData().getName());
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(sysStaffOrgFeign.getOrgSidByPath(orgPath).getData()).getData();
+            //出库申请单号
+            String billNo = "";
+            String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+            billNo = "XSCKD" + sysOrganizationVo.getOrgCode() + date;
+            String v = baseMapper.selectNum(billNo);
+            if (StringUtils.isNotBlank(v)) {
+                billNo = Rule.getBillNo(billNo, Integer.valueOf(v).intValue());
+            } else {
+                billNo = Rule.getBillNo(billNo, 0);
+            }
+            busDeliveredApply.setBillNo(billNo);
             //根据合同编号查询销售订单的信息
             ResultBean<AppOrderDetailsVo> resultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(contractNo);
             if (!resultBean.getSuccess()) {
@@ -877,6 +890,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 busDeliveredApplyDetailsService.insert(busDeliveredApplyDetails);
             }
             baseMapper.insert(busDeliveredApply);
+            sid = busDeliveredApply.getSid();
 
         } else {
             //根据出库申请sid查询出库申请是否存在
@@ -884,7 +898,14 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             if (busDeliveredApply == null) {
                 return rb.setMsg("该出库申请不存在");
             }
+            if(StringUtils.isBlank(dto.getStaffDeptSid())){
+                dto.setStaffDeptSid(busDeliveredApply.getStaffDeptSid());
+            }
+            if(StringUtils.isBlank(dto.getStaffUserSid())){
+                dto.setStaffUserSid(busDeliveredApply.getStaffUserSid());
+            }
             BeanUtil.copyProperties(dto, busDeliveredApply, "sid");
+
             //根据合同编号查询销售订单的信息
             ResultBean<AppOrderDetailsVo> resultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(contractNo);
             if (!resultBean.getSuccess()) {
@@ -1023,7 +1044,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             updateById(busDeliveredApply);
             return rb.success().setData(busDeliveredApply.getSid());
         }*/
-        return rb.success();
+        return rb.success().setData(sid);
     }
 
     public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
@@ -1050,7 +1071,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             //根据出库申请单的sid查询需要出库的车辆信息
             List<AppCarListVo> voList = busDeliveredApplyDetailsService.appDetailsList(sid);
             for (int i = 0; i < voList.size(); i++) {
-               /* BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(voList.get(i).getUseMessageSid());
+              /* BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(voList.get(i).getUseMessageSid());
                 AppUseInfoVo appUseInfoVo = new AppUseInfoVo();
                 appUseInfoVo.setMobile(busDeliveredUseMessage.getMobile());
                 appUseInfoVo.setCustomer(busDeliveredUseMessage.getName());
@@ -1067,20 +1088,49 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         return rb.success().setData(vo);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public ResultBean submitAppDeliveredApply(AppSubmitDeliveredApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        //根据用户sid获取staffSid
-        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
-        if (!userVoResultBean.getSuccess()) {
-            return rb.setMsg(userVoResultBean.getMsg());
+        //判断选择的优惠是否超出
+        List<AppCarListVo> carList = dto.getCarList();
+        if (!carList.isEmpty()) {
+            //判断已经选择的车辆是否已经提交
+            List<String> vinSid = carList.stream().map(AppCarListVo::getVinSid).collect(Collectors.toList());
+            List<String> vinNoList = baseMapper.selectVinNo(dto.getContractId(), vinSid);
+            if (!vinNoList.isEmpty()) {
+                return rb.setMsg(String.join(",", vinNoList) + "已提交或已出库");
+            }
+            //判断是否存在优惠包超出的情况
+            for (int i = 0; i < carList.size(); i++) {
+                AppCarListVo appCarListVo = carList.get(i);
+                List<BusDeliveredDetailsDiscountsVo> discountUse = appCarListVo.getDiscountUse();
+                for (int j = 0; j < discountUse.size(); j++) {
+                    BusDeliveredDetailsDiscountsVo busDeliveredDetailsDiscountsVo = discountUse.get(j);
+                    //根据discountSid查询已通过或已提交的申请的赠送套餐的数量
+                    int count = busDeliveredDetailsDiscountService.selectGiveNumBySid(busDeliveredDetailsDiscountsVo.getDiscountSid());
+                    int giveNum = count + busDeliveredDetailsDiscountsVo.getDiscountNum();
+                    if (busDeliveredDetailsDiscountsVo.getTotalNum() < giveNum) {
+                        return rb.setMsg("车辆赠送的优惠包已超出");
+                    }
+                }
+            }
         }
-        //根据staffSid获取用户的组织全路径
-        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
-        if (!staffOrgResultBean.getSuccess()) {
-            return rb.setMsg(staffOrgResultBean.getMsg());
+        String orgSidPath = "";
+        if (StringUtils.isNotBlank(dto.getOrgPath())) {
+            orgSidPath = dto.getOrgPath();
+        } else {
+            //根据用户sid获取staffSid
+            ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
+            if (!userVoResultBean.getSuccess()) {
+                return rb.setMsg(userVoResultBean.getMsg());
+            }
+            //根据staffSid获取用户的组织全路径
+            ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+            if (!staffOrgResultBean.getSuccess()) {
+                return rb.setMsg(staffOrgResultBean.getMsg());
+            }
+            orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         }
-        //用户的组织全路径
-        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         BusDeliveredApply busDeliveredApply = fetchBySid(dto.getSid());
         int r = submitAppBusinessData(dto, busDeliveredApply);
         if (r == 3) {
@@ -1095,12 +1145,11 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             return rb.setMsg(resultBean.getMsg());
         }
         String sid = resultBean.getData();
-        //更改状态
-        List<String> stringList = busDeliveredApplyDetailsService.selectVinByApplySid(sid);
-        for (int i = 0; i < stringList.size(); i++) {
-            String vinNo = stringList.get(i);
-            busDeliveredService.updateState(vinNo, 0);
-        }
+        //将该申请的车架号的待出库中的状态修改为出库中
+        List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid);
+        //更新该合同的该车架号的状态为0
+        busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 0);
+        //更新出库申请的状态为待审核2
         baseMapper.updateStateBySid(2, sid);
         String businessSid = resultBean.getData();
         //创建BusinessVariables实体对象
@@ -1146,7 +1195,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             }
             bv.setTaskId(busDeliveredApply.getTaskId());
             bv.setTaskDefKey(busDeliveredApply.getTaskDefKey());
-            bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
+            bv.setComment("重新提交");
             bv.setInstanceId(dto.getInstanceId());
             return complete(bv);
         }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java

@@ -92,4 +92,6 @@ public interface BusDeliveredApplyDetailsMapper extends BaseMapper<BusDeliveredA
     List<String> selectVinByApplySid(String sid);
 
     List<BusDeliveredApplyDetails> selectByApplySid(String outboundSid);
+
+    List<String> selectVinSidByApplySid(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml

@@ -62,6 +62,15 @@
 
     <select id="selectByApplySid"
             resultType="com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetails">
-        select * from bus_delivered_apply_details where applySid = #{outboundSid}
+        select *
+        from bus_delivered_apply_details
+        where applySid = #{outboundSid}
+    </select>
+
+    <select id="selectVinSidByApplySid" resultType="java.lang.String">
+        select bv.sid
+        from bus_delivered_apply_details bd
+        left join bus_sales_order_vehicle bv on bv.linkSid = bd.vinSid
+        where bd.applySid = #{sid}
     </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java

@@ -218,4 +218,8 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
     public List<BusDeliveredApplyDetails> selectByApplySid(String outboundSid) {
         return baseMapper.selectByApplySid(outboundSid);
     }
+
+    public List<String> selectVinSidByApplySid(String sid) {
+        return baseMapper.selectVinSidByApplySid(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.java

@@ -30,4 +30,6 @@ public interface BusDeliveredDetailsDiscountMapper extends BaseMapper<BusDeliver
     List<BusDeliveredDetailsDiscount> selectByVinSid(String sid);
 
     int selectGiveNum(@Param("discountSid") String discountSid, @Param("sid") String sid);
+
+    int selectGiveNumBySid(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.xml

@@ -8,7 +8,7 @@
     </select>
 
     <select id="selectCounts" resultType="int">
-        select IFNULL(SUM(cast(bd.giveNum as signed)),0) as count
+        select IFNULL(SUM(cast(bd.giveNum as signed)), 0) as count
         from bus_delivered_details_discount bd
                  left join bus_delivered_apply_details bad on bad.sid = bd.detailsSid
                  left join bus_delivered_apply bda on bda.sid = bad.applySid
@@ -24,10 +24,22 @@
 
     <select id="selectByVinSid"
             resultType="com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetailsDiscount">
-        select * from bus_delivered_details_discount where detailsSid = #{sid}
+        select *
+        from bus_delivered_details_discount
+        where detailsSid = #{sid}
     </select>
 
     <select id="selectGiveNum" resultType="int">
-        select IFNULL(SUM(cast(giveNum as signed)),0) as count from bus_delivered_details_discount where discountSid = #{discountSid} and applySid = #{sid}
+        select IFNULL(SUM(cast(giveNum as signed)), 0) as count
+        from bus_delivered_details_discount
+        where discountSid = #{discountSid}
+          and applySid = #{sid}
+    </select>
+
+    <select id="selectGiveNumBySid" resultType="int">
+        select IFNULL(SUM(cast(giveNum as signed)), 0) as count
+        from bus_delivered_details_discount bd
+                 left join bus_delivered_apply ba on ba.sid = bd.applySid
+        where ba.state = 2 or ba.state = 3
     </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountService.java

@@ -33,4 +33,8 @@ public class BusDeliveredDetailsDiscountService extends MybatisBaseService<BusDe
     public int selectGiveNum(String discountSid, String sid) {
         return baseMapper.selectGiveNum(discountSid,sid);
     }
+
+    public int selectGiveNumBySid(String sid) {
+        return baseMapper.selectGiveNumBySid(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -105,4 +105,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
 
     @Select("select * from bus_sales_order_vehicle where sid = #{busVinSid}")
     BusSalesOrderVehicle selectBySalesOrderVehiclerSid(String busVinSid);
+
+    BusSalesOrderVehicle selectByNoAndVinSid(@Param("contractNo") String contractNo,@Param("vinSid") String vinSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -222,4 +222,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectBySalesOrderVehiclerSid(busVinSid);
         return rb.success().setData(busSalesOrderVehicle);
     }
+
+    public BusSalesOrderVehicle selectByNoAndVinSid(String contractNo,String vinSid){
+        return baseMapper.selectByNoAndVinSid(contractNo,vinSid);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java

@@ -77,20 +77,11 @@ public interface AppBusDeliveredApplyFeign {
     @ResponseBody
     public ResultBean<PagerVo<DeliveredApplyPageVo>> getRetrievalApplyList(@RequestBody PagerQuery<DeliveredApplyPageQuery> pagerQuery);
 
-/*    @ApiOperation("手机端-初始化 出库申请")
-    @GetMapping("/getRetrievalApplyInfoBySid/{sid}")
-    @ResponseBody
-    public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@PathVariable("sid") String sid);*/
-
-    @ApiOperation("手机端-初始化 出库申请")
+   /* @ApiOperation("手机端-初始化 出库申请")
     @GetMapping("/getRetrievalApplyInfoBySid")
     @ResponseBody
-    public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@RequestParam("sid") String sid);
+    public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@RequestParam("sid") String sid);*/
 
-    /* @ApiOperation("手机端-出库申请 详情")
-     @GetMapping("/getRetrievalDetail/{sid}")
-     @ResponseBody
-     public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(@PathVariable("sid") String sid);*/
     @ApiOperation("手机端-出库申请 详情")
     @GetMapping("/getRetrievalDetail")
     @ResponseBody
@@ -101,20 +92,11 @@ public interface AppBusDeliveredApplyFeign {
     @ResponseBody
     public ResultBean saveRetrievalApplyInfo(@RequestBody DeliveredApplyDto deliveredApplyDto);
 
-  /*  @ApiOperation("初始化 出库申请 车架号")
-    @GetMapping("/getRetrievalCarVin/{sid}")
-    @ResponseBody
-    public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(@PathVariable("sid") String sid);*/
-
     @ApiOperation("初始化 出库申请 车架号")
     @GetMapping("/getRetrievalCarVin")
     @ResponseBody
     public ResultBean<List<AppCarVinsListVo>> getRetrievalCarVin(@RequestParam("sid") String sid);
-
-    /*  @ApiOperation("删除 出库申请记录")
-      @DeleteMapping("/deleteRetrievalInfo/{sid}")
-      @ResponseBody
-      public ResultBean deleteRetrievalInfo(@PathVariable("sid") String sid);*/
+    
     @ApiOperation("删除 出库申请记录")
     @DeleteMapping("/deleteRetrievalInfo")
     @ResponseBody

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java

@@ -68,10 +68,10 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe
         return null;
     }
 
-    @Override
+  /*  @Override
     public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
         return null;
-    }
+    }*/
 
     @Override
     public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(String sid) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java

@@ -72,18 +72,18 @@ public class DeliveredDetailsVo implements Vo {
     private String loanMobile;
     @ApiModelProperty("总备注")
     private String remarks;
-    @ApiModelProperty("用户sid")
-    private String userSid;
+   /* @ApiModelProperty("用户sid")
+    private String userSid;*/
     @ApiModelProperty("记录sid")
     private String sid;
     @ApiModelProperty("orgPath")
     private String orgPath;
 
-    private String applyName;
+   /* private String applyName;
     private String applySid;
     private String applyDeptSid;
     private String staffUserSid;
-    private String applyDept;
+    private String applyDept;*/
     @ApiModelProperty("车辆集合")
     private List<CarListVo> carList = new ArrayList<>();
     @ApiModelProperty("剩余")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java

@@ -25,8 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.terminal.biz.autoservice.retrieval;
 
-import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsQuery;
-import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo;
 import com.yxt.anrui.terminal.api.autoservice.retrieval.*;
 import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.CompleteRetrievalDto;
 import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalQuery;
@@ -37,7 +35,6 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -79,10 +76,10 @@ public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign {
         return appBusDeliveredApplyService.getRetrievalApplyList(pagerQuery);
     }
 
-    @Override
+  /*  @Override
     public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
         return appBusDeliveredApplyService.getRetrievalApplyInfoBySid(sid);
-    }
+    }*/
 
     @Override
     public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(String sid) {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

@@ -116,7 +116,7 @@ public class AppBusDeliveredApplyService {
         return rb.success().setData(vo);
     }
 
-    public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
+   /* public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
         ResultBean<DeliveredApplyInfoVo> rb = ResultBean.fireFail();
         DeliveredApplyInfoVo vo = new DeliveredApplyInfoVo();
         ResultBean<AppDeliveredApplyInfoVo> resultBean = busDeliveredApplyFeign.getRetrievalApplyInfoBySid(sid);
@@ -127,7 +127,7 @@ public class AppBusDeliveredApplyService {
         BeanUtil.copyProperties(appDeliveredApplyInfoVo, vo);
         vo.setSid(sid);
         return rb.success().setData(vo);
-    }
+    }*/
 
     public ResultBean saveRetrievalApplyInfo(DeliveredApplyDto deliveredApplyDto) {
         AppDeliveredApplyDto dto = new AppDeliveredApplyDto();