|
|
|
@ -46,7 +46,6 @@ import com.yxt.anrui.base.common.utils.domain.BillNo; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; |
|
|
|
import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundDto; |
|
|
|
import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundFeign; |
|
|
|
import com.yxt.common.base.config.component.FileUploadComponent; |
|
|
|
@ -62,7 +61,6 @@ import org.springframework.stereotype.Service; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.List; |
|
|
|
import java.util.UUID; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
@ -146,7 +144,14 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa |
|
|
|
|
|
|
|
public PagerVo<VehicleOrderListVo> listPageVo(PagerQuery<BusVehicleOrderQuery> pq) { |
|
|
|
BusVehicleOrderQuery query = pq.getParams(); |
|
|
|
String staffSid = query.getStaffSid(); |
|
|
|
if(StringUtils.isNotBlank(query.getOrgPath())){ |
|
|
|
String orgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); |
|
|
|
query.setUseOrgSid(orgSid); |
|
|
|
}else{ |
|
|
|
String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData(); |
|
|
|
query.setUseOrgSid(orgSid); |
|
|
|
} |
|
|
|
/* String staffSid = query.getStaffSid(); |
|
|
|
ResultBean<List<SysStaffOrgVo>> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid); |
|
|
|
List<SysStaffOrgVo> data = sysStaffOrgListByStaffSid.getData(); |
|
|
|
String orgSidPath = ""; |
|
|
|
@ -166,7 +171,7 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
query.setUseOrgSid(orgSidPath); |
|
|
|
query.setUseOrgSid(orgSidPath);*/ |
|
|
|
QueryWrapper<BusVehicleOrder> qw = createQueryWrapper(query); |
|
|
|
IPage<BusVehicleOrder> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<VehicleOrderListVo> pagging = baseMapper.selectPageVo(page, qw); |
|
|
|
@ -190,7 +195,7 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa |
|
|
|
*/ |
|
|
|
public ResultBean saveOrUpdateVehicleOrder(BusVehicleOrderDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
if (StringUtils.isBlank(dto.getSid())) { |
|
|
|
/*if (StringUtils.isBlank(dto.getSid())) { |
|
|
|
BusVehicleOrder vehicleOrder = new BusVehicleOrder(); |
|
|
|
BeanUtil.copyProperties(dto, vehicleOrder);// 新增
|
|
|
|
String staffSid = dto.getStaffSid(); |
|
|
|
@ -218,9 +223,12 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa |
|
|
|
vehicleOrder.setSid(UUID.randomUUID().toString()); |
|
|
|
save(vehicleOrder); |
|
|
|
return rb.success(); |
|
|
|
} else { // 修改
|
|
|
|
} else { // 修改*/
|
|
|
|
BusVehicleOrder vehicleOrder = fetchBySid(dto.getSid()); |
|
|
|
BeanUtil.copyProperties(dto, vehicleOrder); |
|
|
|
if(vehicleOrder == null){ |
|
|
|
return rb.setMsg("该采购订单不存在"); |
|
|
|
} |
|
|
|
BeanUtil.copyProperties(dto, vehicleOrder,"createOrgSid"); |
|
|
|
//订单日期
|
|
|
|
String orderDate = dto.getOrderDate(); |
|
|
|
//下线日期
|
|
|
|
@ -250,7 +258,6 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa |
|
|
|
scmApplyInbound.setModelSid(busVehicleApplyDetail.getVehicleSid()); |
|
|
|
scmApplyInbound.setModelName(busVehicleApplyDetail.getVehicleName()); |
|
|
|
scmApplyInbound.setApplicationDate(DateUtil.today()); |
|
|
|
// scmApplyInbound.setVehicleOrderSid(dto.getSid());
|
|
|
|
scmApplyInbound.setVehicleOrderSid(vehicleOrder.getPurchaseRequisitionSid()); |
|
|
|
scmApplyInbound.setPurchaseOrderNo(dto.getOrderNo()); |
|
|
|
scmApplyInbound.setApplicationSid(dto.getUserSid()); |
|
|
|
@ -267,18 +274,14 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa |
|
|
|
scmApplyInbound.setCostPrice(new BigDecimal(contractPrice)); |
|
|
|
} |
|
|
|
} |
|
|
|
/* |
|
|
|
scmApplyInbound.setContractPrice(new BigDecimal(contractPrice)); |
|
|
|
scmApplyInbound.setCostPrice(new BigDecimal(contractPrice)); |
|
|
|
*/ |
|
|
|
scmApplyInbound.setInsideCode(busVehicleApplyDetail.getInsideCode()); |
|
|
|
scmApplyInbound.setManPurOrderTypeKey(ManPurOrderType.ManOrderType.PC_ORDER.getCode()); |
|
|
|
scmApplyInbound.setManPurOrderTypeValue(ManPurOrderType.ManOrderType.PC_ORDER.getRemarks()); |
|
|
|
scmApplyInbound.setUseOrgSid(dto.getCreateOrgSid()); |
|
|
|
scmApplyInbound.setUseOrgSid(vehicleOrder.getCreateOrgSid()); |
|
|
|
scmApplyInboundFeign.saveOrUpdateApplyInBound(scmApplyInbound); |
|
|
|
} |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
/* }*/ |
|
|
|
} |
|
|
|
|
|
|
|
public String getApplyCode(String userSid) { |
|
|
|
|
