yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

供应链问题修改

master
hp 3 years ago
parent
b1ab890328
commit
33db470392
6 changed files with 58 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java
  2. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
  3. 25
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryService.java
  4. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModPriceCompleteDto.java
  5. 22
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/modelAdjust/AppBaseModelModpriceService.java
  6. 19
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/purchaseReturn/AppScmVehicleReturnService.java

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java
View File

@ -116,6 +116,6 @@ public interface ScmVehicleGressionMapper extends BaseMapper<ScmVehicleGression>
List<ScmVehicleGressionVo> getlastTimeEqual(@Param("vinNo") String vinNo, @Param("targetLocationSid") String targetLocationSid);
@Select("SELECT count(*) FROM scm_vehicle_gression WHERE useOrgSid = #{useOrgSid} and handleState = '1' ")
int getToDoNum(@Param("useOrgSid") String useOrgSid);
@Select("SELECT count(*) FROM scm_vehicle_gression WHERE useOrgSid = #{useOrgSid} and createBySid = #{userSid} and handleState = '1' ")
int getToDoNum(@Param("useOrgSid") String useOrgSid, @Param("userSid") String userSid);
}

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
View File

@ -1052,7 +1052,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
public ResultBean<String> getToDoNum(String userSid) {
ResultBean rb = ResultBean.fireFail();
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
int count = baseMapper.getToDoNum(useOrgSid);
int count = baseMapper.getToDoNum(useOrgSid,userSid);
return rb.success().setData(String.valueOf(count));
}

25
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryService.java
View File

@ -186,17 +186,19 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicl
// 查询上一次的盘库人,盘库时间
List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = selInventory(record.getVin(), record.getId(), useOrgSid);
if (scmVehicleStayInventoryVos.size() <= 0) {
record.setInventoryDate("无");
} else {
ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0);
record.setInventoryDate(simpleDateFormat.format(scmVehicleStayInventoryVo.getLastDate()));
}
if (scmVehicleStayInventoryVos.size() <= 0) {
record.setInventoryName("无");
} else {
if (scmVehicleStayInventoryVos.size() > 0) {
ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0);
record.setInventoryName(scmVehicleStayInventoryVo.getLastName());
if (scmVehicleStayInventoryVo.getLastDate() == null) {
record.setInventoryDate("无");
} else {
record.setInventoryDate(simpleDateFormat.format(scmVehicleStayInventoryVo.getLastDate()));
}
if (StringUtils.isBlank(scmVehicleStayInventoryVo.getLastName())) {
record.setInventoryName("无");
} else {
record.setInventoryName(scmVehicleStayInventoryVo.getLastName());
}
}
}
return iPage;
@ -212,7 +214,8 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicl
* @param query
* @return
*/
private QueryWrapper<AppScmVehicleStayInventoryListPageVo> appQueryWrapper(AppScmVehicleStayInventoryListPageQuery query) {
private QueryWrapper<AppScmVehicleStayInventoryListPageVo> appQueryWrapper
(AppScmVehicleStayInventoryListPageQuery query) {
QueryWrapper<AppScmVehicleStayInventoryListPageVo> qw = new QueryWrapper<>();
qw.eq("svsi.isDelete", 0);
if (StringUtils.isNotBlank(query.getUseOrgSid())) {

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModPriceCompleteDto.java
View File

@ -15,9 +15,6 @@ public class ModelModPriceCompleteDto implements Dto {
@ApiModelProperty(value = "用户sid")
@NotBlank(message = "参数错误：userSid")
private String userSid;
@ApiModelProperty(value = "用户全路径sid")
// @NotBlank(message = "参数错误：orgSidPath")
private String orgSidPath;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误：taskDefKey")
private String taskDefKey;

22
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/modelAdjust/AppBaseModelModpriceService.java
View File

@ -29,6 +29,11 @@ import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceDetailVo;
import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceFeign;
import com.yxt.anrui.base.api.basemodelmodprice.flow.*;
import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDepositFeign;
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.terminal.api.supplychain.modelAdjust.*;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
@ -55,6 +60,10 @@ public class AppBaseModelModpriceService {
@Autowired
BaseModelModpriceFeign baseModelModpriceFeign;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
/**
* 获取车型调车详情
@ -99,8 +108,21 @@ public class AppBaseModelModpriceService {
*/
public ResultBean agreeModelAdjustInfo(ModelModPriceCompleteDto query) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(query.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());
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
BaseModelModPriceCompleteDto baseModelModPriceCompleteDto = new BaseModelModPriceCompleteDto();
BeanUtil.copyProperties(query, baseModelModPriceCompleteDto);
baseModelModPriceCompleteDto.setOrgSidPath(orgSidPath);
ResultBean resultBean = baseModelModpriceFeign.complete(baseModelModPriceCompleteDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());

19
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/purchaseReturn/AppScmVehicleReturnService.java
View File

@ -4,7 +4,11 @@ package com.yxt.anrui.terminal.biz.supplychain.purchaseReturn;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDepositFeign;
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.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnDetailsVo;
import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnDto;
@ -35,6 +39,8 @@ public class AppScmVehicleReturnService {
BaseVehicleFeign baseVehicleFeign;
@Autowired
SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysUserFeign sysUserFeign;
/**
* 获取采购退库详情
@ -155,8 +161,21 @@ public class AppScmVehicleReturnService {
*/
public ResultBean agreePurchaseReturnInfo(VehicleReturnFlowQuery vehicleReturnFlowQuery) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(vehicleReturnFlowQuery.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());
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
ScmVehicleReturnFlowQuery scmVehicleReturnFlowQuery = new ScmVehicleReturnFlowQuery();
BeanUtil.copyProperties(vehicleReturnFlowQuery, scmVehicleReturnFlowQuery);
scmVehicleReturnFlowQuery.setOrgSidPath(orgSidPath);
ResultBean resultBean = scmVehicleReturnFeign.complete(scmVehicleReturnFlowQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());

Write Preview
Loading…
Cancel
Save