Browse Source

出库审核不通过还原车辆的待出库状态。申请保存提交后更新车辆的状态为已申请出库

master
dimengzhe 3 years ago
parent
commit
111de194b5
  1. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java
  2. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
  3. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
  4. 14
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  5. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java
  6. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml
  7. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java

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

@ -35,6 +35,7 @@ import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.buscenter.api.busdelivered.BusDelivered;
import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo;
import javax.xml.ws.Action;
import java.util.List;
/**
@ -66,4 +67,6 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
@Select("select * from bus_delivered")
List<BusDeliveredVo> selectListVo();
int updateState(@Param("vinNo") String vinNo, @Param("state") int i);
}

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

@ -28,4 +28,10 @@
${ew.sqlSegment}
</where>
</select>
<update id="updateState">
update bus_delivered
set state = #{state}
where vinNo = #{vinNo}
</update>
</mapper>

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

@ -125,4 +125,8 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
BeanUtil.copyProperties(entity, vo);
return vo;
}
public int updateState(String vinNo, int i) {
return baseMapper.updateState(vinNo,i);
}
}

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

@ -34,6 +34,7 @@ import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDet
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsVo;
import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessage;
import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageVo;
import com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredService;
import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService;
import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageService;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@ -73,6 +74,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
private BusDeliveredUseMessageService busDeliveredUseMessageService;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private BusDeliveredService busDeliveredService;
/**
* 构造出库申请的查询条件
@ -149,6 +152,11 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
busDeliveredApplyDetailsService.saveList(dtoList, busDeliveredApply.getSid());
}
}
List<String> stringList = busDeliveredApplyDetailsService.selectVinByApplySid(dtoSid);
for (int i = 0; i < stringList.size(); i++) {
String vinNo = stringList.get(i);
busDeliveredService.updateState(vinNo, 1);
}
return rb.success().setData(dtoSid);
}
@ -317,6 +325,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
return rb.setMsg("请输入不通过的原因");
}
baseMapper.updateStateAndReason(busDeExamineQuery.getSid(), state, busDeExamineQuery.getReason());
//更新待出库车辆的状态
List<String> stringList = busDeliveredApplyDetailsService.selectVinByApplySid(busDeExamineQuery.getSid());
for (int i = 0; i < stringList.size(); i++) {
String vinNo = stringList.get(i);
busDeliveredService.updateState(vinNo, 1);
}
} else {
baseMapper.updateState(busDeExamineQuery.getSid(), state);

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

@ -78,4 +78,6 @@ public interface BusDeliveredApplyDetailsMapper extends BaseMapper<BusDeliveredA
* @return
*/
int deleteByApplySid(String dtoSid);
List<String> selectVinByApplySid(String sid);
}

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

@ -41,4 +41,10 @@
from bus_delivered_apply_details
where applySid = #{dtoSid}
</delete>
<select id="selectVinByApplySid" resultType="java.lang.String">
select vinNo
from bus_delivered_apply_details
where applySid = #{sid}
</select>
</mapper>

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

@ -116,4 +116,8 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
public int deleteByApplySid(String dtoSid) {
return baseMapper.deleteByApplySid(dtoSid);
}
public List<String> selectVinByApplySid(String sid) {
return baseMapper.selectVinByApplySid(sid);
}
}
Loading…
Cancel
Save