UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

出入库明细下载问题

Browse Source
dev_ksck
anthonywj 1 year ago
parent c347996bf2
commit 8c150bdd3b
7 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File

8
src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
Unescape Escape View File

@ -541,7 +541,7 @@ public class UdiRelevanceController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/udiwms/udirel/thirdSys/filterOptimize") @GetMapping("/udiwms/udirel/thirdSys/filterOptimize")
public BaseResponse getThirdSysfilterOptimize(FilterUdiRelRequest filterUdiRelRequest, public BaseResponse getThirdSysfilterOptimize(FilterUdiRelRequest filterUdiRelRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -731,7 +731,7 @@ public class UdiRelevanceController extends BaseController {
} }
boolean falg = udiProductService.updateUdiInfoById(udiProductEntity); boolean falg = udiProductService.updateUdiInfoById(udiProductEntity);
if (udiProductEntity.getRelSupId() != null) { if (udiProductEntity.getRelSupId() != null) {
UdiRlSupEntity udiRlSupEntity = new UdiRlSupEntity(); CompanyProductRelevanceEntity udiRlSupEntity = new CompanyProductRelevanceEntity();
udiRlSupEntity.setUpdateTime(new Date()); udiRlSupEntity.setUpdateTime(new Date());
udiRlSupEntity.setPrice(new BigDecimal(udiProductEntity.getPrice())); udiRlSupEntity.setPrice(new BigDecimal(udiProductEntity.getPrice()));
udiRlSupEntity.setId(Long.valueOf(udiProductEntity.getRelSupId())); udiRlSupEntity.setId(Long.valueOf(udiProductEntity.getRelSupId()));
@ -775,8 +775,8 @@ public class UdiRelevanceController extends BaseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
} }
List<String> ggxhList = udiProductService.getGgxhList(relId); List<String> ggxhList = udiProductService.getGgxhList(relId);
List<DictDto> reList = ggxhList.stream().map(s-> { List<DictDto> reList = ggxhList.stream().map(s -> {
DictDto dictDto = new DictDto(s,s); DictDto dictDto = new DictDto(s, s);
return dictDto; return dictDto;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
return ResultVOUtils.success(reList); return ResultVOUtils.success(reList);

7
src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
Unescape Escape View File

@ -12,10 +12,7 @@ import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.SyncDelType; import com.glxp.api.constant.SyncDelType;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.*;
import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.entity.basic.UdiRlSupEntity;
import com.glxp.api.entity.purchase.PurApplyDetailEntity; import com.glxp.api.entity.purchase.PurApplyDetailEntity;
import com.glxp.api.exception.JsonException; import com.glxp.api.exception.JsonException;
import com.glxp.api.http.sync.SpGetHttpClient; import com.glxp.api.http.sync.SpGetHttpClient;
@ -355,7 +352,7 @@ public class UdiRlSupController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/sale/info/updateCompanyProductRelevance") @PostMapping("/sale/info/updateCompanyProductRelevance")
@Log(title = "供应商字典管理", businessType = BusinessType.UPDATE) @Log(title = "供应商字典管理", businessType = BusinessType.UPDATE)
public BaseResponse updateCompanyProductRelevance(@RequestBody UdiRlSupEntity udiRlSupEntity) { public BaseResponse updateCompanyProductRelevance(@RequestBody CompanyProductRelevanceEntity udiRlSupEntity) {
udiRlSupEntity.setUpdateTime(new Date()); udiRlSupEntity.setUpdateTime(new Date());
int b = udiRlSupService.updateCompanyProductRelevance(udiRlSupEntity); int b = udiRlSupService.updateCompanyProductRelevance(udiRlSupEntity);
return ResultVOUtils.success("修改成功"); return ResultVOUtils.success("修改成功");

3
src/main/java/com/glxp/api/dao/basic/UdiRlSupDao.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.dao.basic; package com.glxp.api.dao.basic;
import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
import com.glxp.api.entity.basic.UdiRlSupEntity; import com.glxp.api.entity.basic.UdiRlSupEntity;
import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest; import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest;
@ -11,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface UdiRlSupDao extends BaseMapperPlus<UdiRlSupDao, UdiRlSupEntity, UdiRlSupEntity> { public interface UdiRlSupDao extends BaseMapperPlus<UdiRlSupDao, CompanyProductRelevanceEntity, CompanyProductRelevanceEntity> {
List<UdiRlSupResponse> filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest); List<UdiRlSupResponse> filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest);

1
src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.entity.basic; package com.glxp.api.entity.basic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;

9
src/main/java/com/glxp/api/service/basic/UdiRlSupService.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.api.service.basic;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.entity.basic.UdiRlSupEntity; import com.glxp.api.entity.basic.UdiRlSupEntity;
import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
@ -10,7 +11,7 @@ import com.glxp.api.res.basic.UdiRlSupResponse;
import java.util.List; import java.util.List;
public interface UdiRlSupService extends IService<UdiRlSupEntity> { public interface UdiRlSupService extends IService<CompanyProductRelevanceEntity> {
List<UdiRlSupResponse> filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest); List<UdiRlSupResponse> filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest);
@ -26,15 +27,15 @@ public interface UdiRlSupService extends IService<UdiRlSupEntity> {
List<UdiRlSupEntity> findByUdiRlId(Long udiRlIdFk); List<UdiRlSupEntity> findByUdiRlId(Long udiRlIdFk);
UdiRlSupEntity selOneByRlId(Long udiRlIdFk); CompanyProductRelevanceEntity selOneByRlId(Long udiRlIdFk);
UdiRlSupEntity findCompanyProductRelevanceByProductUuid(UdiRlSupEntity udiRlSupEntity); UdiRlSupEntity findCompanyProductRelevanceByProductUuid(UdiRlSupEntity udiRlSupEntity);
List<UdiRlSupEntity> getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest); List<UdiRlSupEntity> getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest);
int updateCompanyProductRelevance(UdiRlSupEntity companyCertEntity); int updateCompanyProductRelevance(CompanyProductRelevanceEntity companyCertEntity);
int updateCompanyProductRelevanceByUdiFk(UdiRlSupEntity companyCertEntity); int updateCompanyProductRelevanceByUdiFk(CompanyProductRelevanceEntity companyCertEntity);
boolean insertCompanyProductRelevance(UdiRlSupEntity companyCertEntity); boolean insertCompanyProductRelevance(UdiRlSupEntity companyCertEntity);

13
src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java
Unescape Escape View File

@ -8,6 +8,7 @@ import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.dao.basic.UdiRelevanceDao;
import com.glxp.api.dao.basic.UdiRlSupDao; import com.glxp.api.dao.basic.UdiRlSupDao;
import com.glxp.api.entity.auth.InvBusUserEntity; import com.glxp.api.entity.auth.InvBusUserEntity;
import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.entity.basic.UdiRlSupEntity; import com.glxp.api.entity.basic.UdiRlSupEntity;
import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
@ -24,7 +25,7 @@ import java.util.List;
@Service @Service
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public class UdiRlSupServiceImpl extends ServiceImpl<UdiRlSupDao, UdiRlSupEntity> implements UdiRlSupService { public class UdiRlSupServiceImpl extends ServiceImpl<UdiRlSupDao, CompanyProductRelevanceEntity> implements UdiRlSupService {
@Resource @Resource
UdiRlSupDao udiRlSupDao; UdiRlSupDao udiRlSupDao;
@ -102,8 +103,8 @@ public class UdiRlSupServiceImpl extends ServiceImpl<UdiRlSupDao, UdiRlSupEntity
} }
@Override @Override
public UdiRlSupEntity selOneByRlId(Long udiRlIdFk) { public CompanyProductRelevanceEntity selOneByRlId(Long udiRlIdFk) {
return udiRlSupDao.selectOne(new QueryWrapper<UdiRlSupEntity>().eq("udiRlIdFk", udiRlIdFk).last("limit 1")); return udiRlSupDao.selectOne(new QueryWrapper<CompanyProductRelevanceEntity>().eq("udiRlIdFk", udiRlIdFk).last("limit 1"));
} }
@Override @Override
@ -112,13 +113,13 @@ public class UdiRlSupServiceImpl extends ServiceImpl<UdiRlSupDao, UdiRlSupEntity
} }
@Override @Override
public int updateCompanyProductRelevance(UdiRlSupEntity udiRlSupEntity) { public int updateCompanyProductRelevance(CompanyProductRelevanceEntity udiRlSupEntity) {
return udiRlSupDao.updateById(udiRlSupEntity); return udiRlSupDao.updateById(udiRlSupEntity);
} }
@Override @Override
public int updateCompanyProductRelevanceByUdiFk(UdiRlSupEntity companyCertEntity) { public int updateCompanyProductRelevanceByUdiFk(CompanyProductRelevanceEntity companyCertEntity) {
QueryWrapper<UdiRlSupEntity> ew = new QueryWrapper<>(); QueryWrapper<CompanyProductRelevanceEntity> ew = new QueryWrapper<>();
ew.eq("udiRlIdFk", companyCertEntity.getUdiRlIdFk()); ew.eq("udiRlIdFk", companyCertEntity.getUdiRlIdFk());
return udiRlSupDao.update(companyCertEntity, ew); return udiRlSupDao.update(companyCertEntity, ew);
} }

18
src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java
Unescape Escape View File

@ -210,7 +210,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
thrInvOrderDetail.setNameCode(nameCode); thrInvOrderDetail.setNameCode(nameCode);
thrInvOrderDetail.setRelId(relId); thrInvOrderDetail.setRelId(relId);
//校验产品是否被供应商关联 //校验产品是否被供应商关联
UdiRlSupEntity udiRlSupEntity = udiRlSupService.selOneByRlId(relId); CompanyProductRelevanceEntity udiRlSupEntity = udiRlSupService.selOneByRlId(relId);
if (udiRlSupEntity != null) if (udiRlSupEntity != null)
thrInvOrderDetail.setSupId(udiRlSupEntity.getCustomerId()); thrInvOrderDetail.setSupId(udiRlSupEntity.getCustomerId());
else else
@ -576,7 +576,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
updateThrInvOrderDetails.add(item); updateThrInvOrderDetails.add(item);
//校验产品是否被供应商关联 //校验产品是否被供应商关联
UdiRlSupEntity udiRlSupEntity = udiRlSupService.selOneByRlId(relId); CompanyProductRelevanceEntity udiRlSupEntity = udiRlSupService.selOneByRlId(relId);
if (udiRlSupEntity != null) if (udiRlSupEntity != null)
item.setSupId(udiRlSupEntity.getCustomerId()); item.setSupId(udiRlSupEntity.getCustomerId());
else else
@ -674,8 +674,8 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
log.info("手动抓取第三方收费出入库明细生成单据定时任务开始"); log.info("手动抓取第三方收费出入库明细生成单据定时任务开始");
FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest(); FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest();
filterInvProductRequest.setThirdSys(filterDownloadInvOrderRequest.getThirdSysFk()); filterInvProductRequest.setThirdSys(filterDownloadInvOrderRequest.getThirdSysFk());
filterInvProductRequest.setStartDate(stringToDate(filterInvProductRequest.getStartDate() + " 00:00:00")); filterInvProductRequest.setStartDate(stringToDate(filterDownloadInvOrderRequest.getStartDate() + " 00:00:00"));
filterInvProductRequest.setEndDate(stringToDate(filterInvProductRequest.getEndDate() + " 23:59:59")); filterInvProductRequest.setEndDate(stringToDate(filterDownloadInvOrderRequest.getEndDate() + " 23:59:59"));
handleExternalThrInvSfOrder(filterInvProductRequest); handleExternalThrInvSfOrder(filterInvProductRequest);
log.info("手动抓取第三方收费出入库明细生成单据定时任务结束"); log.info("手动抓取第三方收费出入库明细生成单据定时任务结束");
} }
@ -685,8 +685,8 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
log.info("手动抓取第三方高耗出入库明细生成单据定时任务开始"); log.info("手动抓取第三方高耗出入库明细生成单据定时任务开始");
FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest(); FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest();
filterInvProductRequest.setThirdSys(filterDownloadInvOrderRequest.getThirdSysFk()); filterInvProductRequest.setThirdSys(filterDownloadInvOrderRequest.getThirdSysFk());
filterInvProductRequest.setStartDate(stringToDate(filterInvProductRequest.getStartDate() + " 00:00:00")); filterInvProductRequest.setStartDate(stringToDate(filterDownloadInvOrderRequest.getStartDate() + " 00:00:00"));
filterInvProductRequest.setEndDate(stringToDate(filterInvProductRequest.getEndDate() + " 23:59:59")); filterInvProductRequest.setEndDate(stringToDate(filterDownloadInvOrderRequest.getEndDate() + " 23:59:59"));
handleExternalThrInvSfOrder(filterInvProductRequest); handleExternalThrInvSfOrder(filterInvProductRequest);
log.info("手动抓取第三方高耗出入库明细生成单据定时任务结束"); log.info("手动抓取第三方高耗出入库明细生成单据定时任务结束");
} }
@ -696,8 +696,8 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
log.info("手动抓取第三方普耗出入库明细生成单据定时任务开始"); log.info("手动抓取第三方普耗出入库明细生成单据定时任务开始");
FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest(); FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest();
filterInvProductRequest.setThirdSys(filterDownloadInvOrderRequest.getThirdSysFk()); filterInvProductRequest.setThirdSys(filterDownloadInvOrderRequest.getThirdSysFk());
filterInvProductRequest.setStartDate(stringToDate(filterInvProductRequest.getStartDate() + " 00:00:00")); filterInvProductRequest.setStartDate(stringToDate(filterDownloadInvOrderRequest.getStartDate() + " 00:00:00"));
filterInvProductRequest.setEndDate(stringToDate(filterInvProductRequest.getEndDate() + " 23:59:59")); filterInvProductRequest.setEndDate(stringToDate(filterDownloadInvOrderRequest.getEndDate() + " 23:59:59"));
handleExternalThrInvSfOrder(filterInvProductRequest); handleExternalThrInvSfOrder(filterInvProductRequest);
log.info("手动抓取第三方普耗出入库明细生成单据定时任务结束"); log.info("手动抓取第三方普耗出入库明细生成单据定时任务结束");
} }
@ -880,7 +880,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
exmsg.append(thrCode + ","); exmsg.append(thrCode + ",");
} }
//校验产品是否被供应商关联 //校验产品是否被供应商关联
UdiRlSupEntity udiRlSupEntity = udiRlSupService.selOneByRlId(relId); CompanyProductRelevanceEntity udiRlSupEntity = udiRlSupService.selOneByRlId(relId);
if (udiRlSupEntity != null) if (udiRlSupEntity != null)
thrInvOrderDetail.setSupId(udiRlSupEntity.getCustomerId()); thrInvOrderDetail.setSupId(udiRlSupEntity.getCustomerId());
else else

Write Preview
Loading…
Cancel
Save