|
|
@ -11,9 +11,11 @@ import com.chanko.yunxi.mes.module.biz.controller.admin.projectorder.vo.ProjectO
|
|
|
|
import com.chanko.yunxi.mes.module.biz.controller.admin.projectorder.vo.ProjectOrderSaveReqVO;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.controller.admin.projectorder.vo.ProjectOrderSaveReqVO;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.controller.admin.projectorder.vo.ProjectOrderSubPageReqVO;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.controller.admin.projectorder.vo.ProjectOrderSubPageReqVO;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.customer.CustomerDO;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.customer.CustomerDO;
|
|
|
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.material.MaterialDO;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.projectorder.ProjectOrderDO;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.projectorder.ProjectOrderDO;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.projectorder.ProjectOrderSubDO;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.projectorder.ProjectOrderSubDO;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.serialnumber.SerialNumberDO;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.serialnumber.SerialNumberDO;
|
|
|
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.mysql.material.MaterialMapper;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.mysql.projectorder.ProjectOrderMapper;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.mysql.projectorder.ProjectOrderMapper;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.mysql.projectorder.ProjectOrderSubMapper;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.mysql.projectorder.ProjectOrderSubMapper;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.enums.BusinessTypeEnum;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.enums.BusinessTypeEnum;
|
|
|
@ -26,6 +28,7 @@ import com.chanko.yunxi.mes.module.infra.controller.admin.file.vo.file.FilePageR
|
|
|
|
import com.chanko.yunxi.mes.module.infra.dal.dataobject.file.FileDO;
|
|
|
|
import com.chanko.yunxi.mes.module.infra.dal.dataobject.file.FileDO;
|
|
|
|
import com.chanko.yunxi.mes.module.infra.service.file.FileService;
|
|
|
|
import com.chanko.yunxi.mes.module.infra.service.file.FileService;
|
|
|
|
import com.github.dadiyang.equator.GetterBaseEquator;
|
|
|
|
import com.github.dadiyang.equator.GetterBaseEquator;
|
|
|
|
|
|
|
|
import lombok.SneakyThrows;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
@ -74,6 +77,9 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private ChanjetManager chanjetManager;
|
|
|
|
private ChanjetManager chanjetManager;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
|
|
|
private MaterialMapper materialMapper;
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public Long createProjectOrder(ProjectOrderSaveReqVO createReqVO) {
|
|
|
|
public Long createProjectOrder(ProjectOrderSaveReqVO createReqVO) {
|
|
|
@ -251,6 +257,23 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return projectOrderSubDOList;
|
|
|
|
return projectOrderSubDOList;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
@SneakyThrows
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public MaterialDO getProjectOrderMaterial(String code, Long whId){
|
|
|
|
|
|
|
|
MaterialDO materialDO = materialMapper.selectOne("code",code);
|
|
|
|
|
|
|
|
List<String> codes = new ArrayList<>();
|
|
|
|
|
|
|
|
codes.add(code);
|
|
|
|
|
|
|
|
List<QueryCurrentStockResVO> stockMatDatas = chanjetManager.queryStock(codes,whId);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(CollUtil.isNotEmpty(stockMatDatas) && stockMatDatas.get(0).getAvailableQuantity()!=null){
|
|
|
|
|
|
|
|
materialDO.setStockQuantity(new BigDecimal(stockMatDatas.get(0).getAvailableQuantity()));
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
|
|
|
materialDO.setStockQuantity(new BigDecimal(0));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if(materialDO.getInvSafe()==null)materialDO.setInvSafe(new BigDecimal(0));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return materialDO;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|