耗材领用管理代码提交

master
郑明梁 2 years ago
parent 44afbdd651
commit 913dca5ebc

@ -12,19 +12,24 @@ import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
import com.glxp.api.entity.thrsys.ThrSystemEntity;
import com.glxp.api.http.ErpBasicClient;
import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest;
import com.glxp.api.req.basic.CombineSingleUnitRequest;
import com.glxp.api.req.basic.CombineUnitRequest;
import com.glxp.api.req.basic.RemoveRelRequest;
import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest;
import com.glxp.api.req.thrsys.ThrUnitMaintainFilterRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.basic.BasicErpUnitsResponse;
import com.glxp.api.res.basic.BasicProductThirdSysResponse;
import com.glxp.api.res.basic.BasicUnitMaintainResponse;
import com.glxp.api.res.thrsys.ThrUnitMaintainResponse;
import com.glxp.api.service.basic.BasicCorpService;
import com.glxp.api.service.system.CompanyService;
import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.service.thrsys.ThrCorpService;
import com.glxp.api.service.thrsys.ThrSystemDetailService;
import com.glxp.api.service.thrsys.ThrSystemService;
import com.glxp.api.service.thrsys.ThrUnitImportService;
import com.glxp.api.util.CustomUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@ -53,8 +58,8 @@ public class BasicCorpController {
private SystemParamConfigService systemParamConfigService;
@Resource
private ThrSystemService thrSystemService;
// @Resource
// BasicUnitImportService basicUnitImportService;
@Resource
ThrUnitImportService thrUnitImportService;
@Resource
private ThrCorpService thrCorpService;
@Resource
@ -242,7 +247,7 @@ public class BasicCorpController {
@AuthRuleAnnotation("")
@GetMapping("/udiwms/basic/unit/maintain/combineAll")
public BaseResponse combineAll(BasicUnitMaintainFilterRequest unitMaintainFilterRequest, BindingResult bindingResult) {
public BaseResponse combineAll(ThrUnitMaintainFilterRequest unitMaintainFilterRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -251,7 +256,7 @@ public class BasicCorpController {
if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
return ResultVOUtils.error(500, "往来单位接口地址未定义");
if (basicThirdSysDetailEntity.getEnabled()) {
// basicUnitImportService.selectAllUnit(basicThirdSysDetailEntity, unitMaintainFilterRequest);
thrUnitImportService.selectAllUnit(basicThirdSysDetailEntity, unitMaintainFilterRequest);
} else {
return ResultVOUtils.error(500, "第三方系统往来单位接口服务未启用");
@ -261,71 +266,66 @@ public class BasicCorpController {
return ResultVOUtils.success("后台正在添加,请稍后刷新查看!");
}
// @AuthRuleAnnotation("")
// @PostMapping("/udiwms/basic/unit/maintain/combineSingle")
// public BaseResponse combineSingle(@RequestBody CombineSingleUnitRequest combineRequest, BindingResult bindingResult) {
//
// if (bindingResult.hasErrors()) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
// }
// ErpUnitsResponse erpUnitsResponse = combineRequest.getErpUnitsResponse();
// BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity();
// basicUnitMaintainEntity.setId(Integer.parseInt(combineRequest.getKey()));
// if (combineRequest.getThirdSys() != null) {
// if ("thirdId".equals(combineRequest.getThirdSys())) {
// basicUnitMaintainEntity.setThirdId(erpUnitsResponse.getId());
// basicUnitMaintainEntity.setThirdName(erpUnitsResponse.getName());
// } else if ("thirdId1".equals(combineRequest.getThirdSys())) {
// basicUnitMaintainEntity.setThirdId1(erpUnitsResponse.getId());
// basicUnitMaintainEntity.setThirdName1(erpUnitsResponse.getName());
// } else if ("thirdId2".equals(combineRequest.getThirdSys())) {
// basicUnitMaintainEntity.setThirdId2(erpUnitsResponse.getId());
// basicUnitMaintainEntity.setThirdName2(erpUnitsResponse.getName());
// } else if ("thirdId3".equals(combineRequest.getThirdSys())) {
// basicUnitMaintainEntity.setThirdId3(erpUnitsResponse.getId());
// basicUnitMaintainEntity.setThirdName3(erpUnitsResponse.getName());
// } else if ("thirdId4".equals(combineRequest.getThirdSys())) {
// basicUnitMaintainEntity.setThirdId4(erpUnitsResponse.getId());
// basicUnitMaintainEntity.setThirdName4(erpUnitsResponse.getName());
// }
// }
//// basicUnitMaintainEntity.setThirdName(erpUnitsResponse.getName());
//// basicUnitMaintainEntity.setSpell(erpUnitsResponse.getSpell());
//// basicUnitMaintainEntity.setAddr(erpUnitsResponse.getAddr());
//// basicUnitMaintainEntity.setCreditNo(erpUnitsResponse.getCreditNo());
//// basicUnitMaintainEntity.setContact(erpUnitsResponse.getContact());
//// basicUnitMaintainEntity.setMobile(erpUnitsResponse.getMobile());
// basicUnitMaintainService.updateById(basicUnitMaintainEntity);
// return ResultVOUtils.success("关联成功");
// }
//
// //解除绑定
// @AuthRuleAnnotation("")
// @GetMapping("/udiwms/unit/thirdSys/removeRl")
// public BaseResponse uploadThirdServcie(RemoveRelRequest removeRelRequest) {
// BasicUnitMaintainEntity udiRelevanceEntity = basicUnitMaintainService.selectById(removeRelRequest.getRelId());
// if (removeRelRequest.getThirdSys().equals("thirdId")) {
// udiRelevanceEntity.setThirdId("");
// udiRelevanceEntity.setThirdName("");
// } else if (removeRelRequest.getThirdSys().equals("thirdId1")) {
// udiRelevanceEntity.setThirdId1("");
// udiRelevanceEntity.setThirdName1("");
// } else if (removeRelRequest.getThirdSys().equals("thirdId2")) {
// udiRelevanceEntity.setThirdId2("");
// udiRelevanceEntity.setThirdName2("");
// } else if (removeRelRequest.getThirdSys().equals("thirdId3")) {
// udiRelevanceEntity.setThirdId3("");
// udiRelevanceEntity.setThirdName3("");
// } else if (removeRelRequest.getThirdSys().equals("thirdId4")) {
// udiRelevanceEntity.setThirdId4("");
// udiRelevanceEntity.setThirdName4("");
// }
// basicUnitMaintainService.updateById(udiRelevanceEntity);
//
// return ResultVOUtils.success("解除绑定成功!");
// }
//
// @AuthRuleAnnotation("")
@AuthRuleAnnotation("")
@PostMapping("/udiwms/basic/unit/maintain/combineSingle")
public BaseResponse combineSingle(@RequestBody CombineSingleUnitRequest combineRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
BasicErpUnitsResponse basicErpUnitsResponse = combineRequest.getBasicErpUnitsResponse();
BasicCorpEntity basicCorpEntity = new BasicCorpEntity();
basicCorpEntity.setId(Integer.parseInt(combineRequest.getKey()));
if (combineRequest.getThirdSys() != null) {
if ("thirdId".equals(combineRequest.getThirdSys())) {
basicCorpEntity.setThirdId(basicErpUnitsResponse.getId());
basicCorpEntity.setThirdName(basicErpUnitsResponse.getName());
} else if ("thirdId1".equals(combineRequest.getThirdSys())) {
basicCorpEntity.setThirdId1(basicErpUnitsResponse.getId());
basicCorpEntity.setThirdName1(basicErpUnitsResponse.getName());
} else if ("thirdId2".equals(combineRequest.getThirdSys())) {
basicCorpEntity.setThirdId2(basicErpUnitsResponse.getId());
basicCorpEntity.setThirdName2(basicErpUnitsResponse.getName());
} else if ("thirdId3".equals(combineRequest.getThirdSys())) {
basicCorpEntity.setThirdId3(basicErpUnitsResponse.getId());
basicCorpEntity.setThirdName3(basicErpUnitsResponse.getName());
} else if ("thirdId4".equals(combineRequest.getThirdSys())) {
basicCorpEntity.setThirdId4(basicErpUnitsResponse.getId());
basicCorpEntity.setThirdName4(basicErpUnitsResponse.getName());
}
}
basicUnitMaintainService.updateById(basicCorpEntity);
return ResultVOUtils.success("关联成功");
}
//解除绑定
@AuthRuleAnnotation("")
@GetMapping("/udiwms/unit/thirdSys/removeRl")
public BaseResponse uploadThirdServcie(RemoveRelRequest removeRelRequest) {
BasicCorpEntity basicCorpEntity = basicUnitMaintainService.selectById(removeRelRequest.getRelId());
if (removeRelRequest.getThirdSys().equals("thirdId")) {
basicCorpEntity.setThirdId("");
basicCorpEntity.setThirdName("");
} else if (removeRelRequest.getThirdSys().equals("thirdId1")) {
basicCorpEntity.setThirdId1("");
basicCorpEntity.setThirdName1("");
} else if (removeRelRequest.getThirdSys().equals("thirdId2")) {
basicCorpEntity.setThirdId2("");
basicCorpEntity.setThirdName2("");
} else if (removeRelRequest.getThirdSys().equals("thirdId3")) {
basicCorpEntity.setThirdId3("");
basicCorpEntity.setThirdName3("");
} else if (removeRelRequest.getThirdSys().equals("thirdId4")) {
basicCorpEntity.setThirdId4("");
basicCorpEntity.setThirdName4("");
}
basicUnitMaintainService.updateById(basicCorpEntity);
return ResultVOUtils.success("解除绑定成功!");
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/basic/unit/maintain/delete")
public BaseResponse deleteBasicUnitMaintain(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {

@ -97,8 +97,10 @@ public class IoOrderController extends BaseController {
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction());
orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
orderEntity.setFromCorp(addOrderRequest.getFromCorp());
orderEntity.setRemark(addOrderRequest.getRemark());
orderEntity.setFromInvCode(addOrderRequest.getFromInvCode());
orderEntity.setDeptCode(addOrderRequest.getDeptCode());
orderEntity.setBillNo(addOrderRequest.getBillNo());
orderEntity.setInvCode(addOrderRequest.getInvCode());
orderService.updateByBillNo(orderEntity);

@ -19,6 +19,7 @@ import com.glxp.api.entity.inout.PurReceiveEntity;
import com.glxp.api.req.inout.AddReceiveDetailRequest;
import com.glxp.api.req.inout.FilterReceiveDetailRequest;
import com.glxp.api.req.inout.FilterReceiveRequest;
import com.glxp.api.req.inout.UpdateReceiveDetailRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.inout.ReceiveDetailResponse;
import com.glxp.api.res.inout.ReceiveResponse;
@ -78,12 +79,10 @@ public class ThrOrderReceiveController extends BaseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
Long userId = customerService.getUserId();
purReceiveEntity.setStatus(purReceiveEntity.getStatus());
purReceiveEntity.setUpdateUser(userId + "");
purReceiveEntity.setUpdateTime(new Date());
String orderNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.LIN_YONG, "yyyyMMdd"));
purReceiveEntity.setBillNo(orderNo);
receiveService.updateOrder(purReceiveEntity);
return ResultVOUtils.success("成功");
}
@ -125,6 +124,7 @@ public class ThrOrderReceiveController extends BaseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
AuthAdmin authAdmin = getUser();
String orderNo = addReceiveDetailRequest.getPurReceiveEntity().getBillNo();
if (addReceiveDetailRequest.getPurReceiveEntity() == null)
return ResultVOUtils.error(500, "未指定订单");
@ -135,7 +135,7 @@ public class ThrOrderReceiveController extends BaseController {
if (StrUtil.isEmpty(purReceiveEntity.getBillNo())) {
InvWarehouseEntity curWarehouseEntity = invWarehouseService.findByInvSubByCode(purReceiveEntity.getInvCode());
InvWarehouseEntity targetWarehouseEntity = invWarehouseService.findByInvSubByCode(purReceiveEntity.getTargetInvCode());
String orderNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.LIN_YONG, "yyyyMMdd"));
orderNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.LIN_YONG, "yyyyMMdd"));
purReceiveEntity.setBillNo(orderNo);
purReceiveEntity.setCreateUser(authAdmin.getId() + "");
purReceiveEntity.setCreateTime(new Date());
@ -145,8 +145,12 @@ public class ThrOrderReceiveController extends BaseController {
receiveService.insertOrder(purReceiveEntity);
}
for (AddReceiveDetailRequest.DetaiData detaiData : addReceiveDetailRequest.getDatas()) {
PurReceiveDetailEntity purReceiveDetailEntity = new PurReceiveDetailEntity();
purReceiveDetailEntity.setOrderIdFk(purReceiveEntity.getBillNo());
purReceiveDetailEntity.setNameCode(detaiData.getNameCode());
purReceiveDetailEntity.setExpireDate(detaiData.getExpireDate());
purReceiveDetailEntity.setProductDate(detaiData.getProductDate());
purReceiveDetailEntity.setRelIdFk(detaiData.getRelId());
purReceiveDetailEntity.setBatchNo(detaiData.getBatchNo());
purReceiveDetailEntity.setSupId(detaiData.getSupId());
@ -154,8 +158,63 @@ public class ThrOrderReceiveController extends BaseController {
}
purReceiveEntity.setUpdateTime(new Date());
receiveService.updateOrder(purReceiveEntity);
return ResultVOUtils.success("成功");
return ResultVOUtils.success(orderNo);
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/receive/detail/Update")
public BaseResponse updateReceiveDetail(@RequestBody UpdateReceiveDetailRequest updateReceiveDetailRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
boolean falg=receivedetailService.updateReceiveDetail(updateReceiveDetailRequest);
if(falg){
return ResultVOUtils.success();
}else{
return ResultVOUtils.error(555,"更新失败!");
}
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/receive/order/del")
public BaseResponse del(String orderIdFk) {
boolean falg=receiveService.delReceive(orderIdFk);
if(falg){
return ResultVOUtils.success();
}else{
return ResultVOUtils.error(555,"删除失败!");
}
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/receive/detail/delReceiveDetail")
public BaseResponse delReceiveDetail(Integer id) {
boolean falg=receivedetailService.delDetail(id+"");
if(falg){
return ResultVOUtils.success();
}else{
return ResultVOUtils.error(555,"删除失败!");
}
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/receive/order/audit")
public BaseResponse audit(@RequestBody PurReceiveEntity purReceiveEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
Long userId = customerService.getUserId();
purReceiveEntity.setStatus(purReceiveEntity.getStatus());
purReceiveEntity.setUpdateUser(userId + "");
purReceiveEntity.setAuditRemark(purReceiveEntity.getAuditRemark());
purReceiveEntity.setAuditTime(new Date());
purReceiveEntity.setAuditUser(userId+"");
purReceiveEntity.setUpdateTime(new Date());
receiveService.updateOrder(purReceiveEntity);
return ResultVOUtils.success("成功");
}
}

@ -3,6 +3,8 @@ package com.glxp.api.dao.basic;
import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest;
import com.glxp.api.res.thrsys.ThrCorpsResponse;
import com.glxp.api.res.thrsys.ThrUnitMaintainResponse;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -14,7 +16,7 @@ public interface BasicCorpDao {
boolean insertBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity);
boolean insertBasicUnitMaintainignore(BasicCorpEntity basicUnitMaintainEntity);
boolean insertThrUnitMaintainignore(ThrUnitMaintainResponse thrUnitMaintainResponse);
boolean insert(BasicCorpEntity basicUnitMaintainEntity);

@ -3,6 +3,7 @@ package com.glxp.api.dao.inout;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.inout.PurReceiveDetailEntity;
import com.glxp.api.req.inout.FilterReceiveDetailRequest;
import com.glxp.api.req.inout.UpdateReceiveDetailRequest;
import com.glxp.api.res.inout.ReceiveDetailResponse;
import com.glxp.api.res.inout.ReceiveResponse;
import org.apache.ibatis.annotations.Mapper;
@ -13,4 +14,8 @@ import java.util.List;
public interface ReceiveDetailDao extends BaseMapperPlus<ReceiveDetailDao, PurReceiveDetailEntity, PurReceiveDetailEntity> {
List<ReceiveDetailResponse> filterList(FilterReceiveDetailRequest filterReceiveDetailRequest);
boolean updateReceiveDetail(UpdateReceiveDetailRequest updateReceiveDetailRequest);
}

@ -0,0 +1,12 @@
package com.glxp.api.req.basic;
import com.glxp.api.res.basic.BasicErpUnitsResponse;
import lombok.Data;
@Data
public class CombineSingleUnitRequest {
private String key;
private String thirdSys;
private BasicErpUnitsResponse basicErpUnitsResponse;
}

@ -0,0 +1,10 @@
package com.glxp.api.req.basic;
import lombok.Data;
@Data
public class RemoveRelRequest {
private String relId;
private String thirdSys;
}

@ -26,4 +26,5 @@ public class AddOrderRequest {
private boolean vailInv;
private boolean codeFillCheck;
private Integer orderType;
private String remark;
}

@ -3,6 +3,7 @@ package com.glxp.api.req.inout;
import com.glxp.api.entity.inout.PurReceiveEntity;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
@ -16,6 +17,9 @@ public class AddReceiveDetailRequest {
private Long relId;
private String batchNo;
private String supId;
private String expireDate;
private String productDate;
private String nameCode;
}

@ -0,0 +1,41 @@
package com.glxp.api.req.inout;
import com.glxp.api.entity.inout.PurReceiveEntity;
import lombok.Data;
import java.util.List;
@Data
public class UpdateReceiveDetailRequest {
private Integer id;
/**
*
*/
private String orderIdFk;
/**
* ID
*/
private Integer relIdFk;
private String nameCode;
/**
*
*/
private Integer count;
/**
* ID
*/
private String supId;
private String productDate;
private String batchNo;
private String expireDate;
}

@ -35,7 +35,11 @@ public class ThrUnitMaintainResponse {
private String thirdName3;
private String thirdName4;
private String createUser;
private Date createTime;
private String updateUser;
private Date updateTime;
private String remark;
private Integer corpType;
private Integer outType;

@ -3,6 +3,8 @@ package com.glxp.api.service.basic;
import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest;
import com.glxp.api.res.thrsys.ThrCorpsResponse;
import com.glxp.api.res.thrsys.ThrUnitMaintainResponse;
import java.util.List;
@ -12,7 +14,7 @@ public interface BasicCorpService {
boolean insertBasicUnitMaintain(BasicCorpEntity basicCorpEntity);
boolean updateById(BasicCorpEntity basicUnitMaintainEntity);
boolean updateById(BasicCorpEntity basicCorpEntity);
boolean insert(BasicCorpEntity basicUnitMaintainEntity);
@ -31,7 +33,7 @@ public interface BasicCorpService {
boolean isExit();
boolean insertBasicUnitMaintainignore(BasicCorpEntity basicUnitMaintainEntity);
boolean insertThrUnitMaintainignore(ThrUnitMaintainResponse thrUnitMaintainResponse);
List<BasicCorpEntity> batchSelectByIds(List<Integer> id);

@ -5,6 +5,8 @@ import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.basic.BasicCorpDao;
import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest;
import com.glxp.api.res.thrsys.ThrCorpsResponse;
import com.glxp.api.res.thrsys.ThrUnitMaintainResponse;
import com.glxp.api.service.basic.BasicCorpService;
import org.springframework.stereotype.Service;
@ -34,8 +36,9 @@ public class BasicCorpServiceImpl implements BasicCorpService {
}
@Override
public boolean insertBasicUnitMaintainignore(BasicCorpEntity basicUnitMaintainEntity) {
return basicCorpDao.insertBasicUnitMaintainignore(basicUnitMaintainEntity);
public boolean insertThrUnitMaintainignore(ThrUnitMaintainResponse thrUnitMaintainResponse) {
thrUnitMaintainResponse.setUpdateTime(new Date());
return basicCorpDao.insertThrUnitMaintainignore(thrUnitMaintainResponse);
}
@Override

@ -20,4 +20,6 @@ public interface ReceiveService {
List<ReceiveResponse> filterList(FilterReceiveRequest filterReceiveRequest);
boolean delReceive(String orderIdFk);
}

@ -3,6 +3,7 @@ package com.glxp.api.service.inout;
import com.glxp.api.entity.inout.PurReceiveDetailEntity;
import com.glxp.api.req.inout.FilterReceiveDetailRequest;
import com.glxp.api.req.inout.FilterReceiveRequest;
import com.glxp.api.req.inout.UpdateReceiveDetailRequest;
import com.glxp.api.res.inout.ReceiveDetailResponse;
import com.glxp.api.res.inout.ReceiveResponse;
@ -14,4 +15,9 @@ public interface ReceivedetailService {
int insert(PurReceiveDetailEntity receiveDetailEntity);
boolean updateReceiveDetail(UpdateReceiveDetailRequest updateReceiveDetailRequest);
boolean delDetail(String id);
}

@ -1,11 +1,14 @@
package com.glxp.api.service.inout.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.inout.ReceiveDetailDao;
import com.glxp.api.entity.inout.PurReceiveDetailEntity;
import com.glxp.api.req.inout.FilterReceiveDetailRequest;
import com.glxp.api.req.inout.UpdateReceiveDetailRequest;
import com.glxp.api.res.inout.ReceiveDetailResponse;
import com.glxp.api.service.inout.ReceivedetailService;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -33,4 +36,17 @@ public class ReceiveDetailServiceImpl implements ReceivedetailService {
public int insert(PurReceiveDetailEntity receiveDetailEntity) {
return receiveDetailDao.insert(receiveDetailEntity);
}
@Override
public boolean updateReceiveDetail(UpdateReceiveDetailRequest updateReceiveDetailRequest) {
return receiveDetailDao.updateReceiveDetail(updateReceiveDetailRequest);
}
@Override
public boolean delDetail(String id) {
receiveDetailDao.deleteById(id);
return true;
}
}

@ -1,7 +1,10 @@
package com.glxp.api.service.inout.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.inout.ReceiveDao;
import com.glxp.api.dao.inout.ReceiveDetailDao;
import com.glxp.api.entity.inout.PurReceiveDetailEntity;
import com.glxp.api.entity.inout.PurReceiveEntity;
import com.glxp.api.req.inout.FilterReceiveRequest;
import com.glxp.api.res.inout.ReceiveResponse;
@ -18,6 +21,9 @@ public class ReceiveServiceImpl implements ReceiveService {
@Resource
ReceiveDao receiveDao;
@Resource
ReceiveDetailDao receiveDetailDao;
@Override
public int insertOrder(PurReceiveEntity purReceiveEntity) {
return receiveDao.insert(purReceiveEntity);
@ -38,4 +44,18 @@ public class ReceiveServiceImpl implements ReceiveService {
}
return receiveDao.filterList(filterReceiveRequest);
}
@Override
public boolean delReceive(String orderIdFk) {
QueryWrapper<PurReceiveEntity> ew=new QueryWrapper<>();
ew.eq("billNo",orderIdFk);
receiveDao.delete(ew);
QueryWrapper<PurReceiveDetailEntity> ew1=new QueryWrapper<>();
ew1.eq("orderIdFk",orderIdFk);
receiveDetailDao.delete(ew1);
return true;
}
}

@ -0,0 +1,118 @@
package com.glxp.api.service.thrsys;
import cn.hutool.extra.pinyin.PinyinUtil;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.entity.thrsys.ThrCorpEntity;
import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
import com.glxp.api.http.ErpBasicClient;
import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest;
import com.glxp.api.req.thrsys.FilterThrCorpRequest;
import com.glxp.api.req.thrsys.ThrUnitMaintainFilterRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.basic.BasicErpUnitsResponse;
import com.glxp.api.res.thrsys.ThrCorpsResponse;
import com.glxp.api.res.thrsys.ThrUnitMaintainResponse;
import com.glxp.api.service.basic.BasicCorpService;
import com.glxp.api.util.CustomUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
@Service
public class ThrUnitImportService {
@Resource
private BasicCorpService basicCorpService;
@Resource
private ThrCorpService thrCorpService;
@Resource
private ErpBasicClient erpBasicClient;
@Async
public void selectAllUnit(ThrSystemDetailEntity thrSystemDetailEntity, ThrUnitMaintainFilterRequest unitMaintainFilterRequest) {
List<ThrCorpsResponse> imports = new ArrayList<>();
if (thrSystemDetailEntity.getFromType() == 0) {
int page = 1;
List<ThrCorpsResponse> erpUnitsResponses = new ArrayList<>();
while (true) {
unitMaintainFilterRequest.setPage(page);
unitMaintainFilterRequest.setLimit(100);
BaseResponse<PageSimpleResponse<ThrCorpsResponse>> baseResponse =
erpBasicClient.getErpCrop(unitMaintainFilterRequest);
List<ThrCorpsResponse> temps = baseResponse.getData().getList();
if (temps.size() < 100) {
erpUnitsResponses.addAll(temps);
break;
} else {
page++;
erpUnitsResponses.addAll(temps);
}
}
imports.addAll(erpUnitsResponses);
} else {
FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest);
filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys());
filterThrCorpRequest.setPage(null);
List<ThrCorpsResponse> thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest);
// List<ThrCorpsResponse> lists = thrCorpEntities.stream().map(
// item -> {
// ThrCorpsResponse thrProductsEntity = new ThrCorpsResponse();
// BeanUtils.copyProperties(item, thrProductsEntity);
// thrProductsEntity.setId(item.getUnitId());
// return thrProductsEntity;
// }
// ).collect(Collectors.toList());
imports.addAll(thrCorpEntities);
}
if (imports != null && imports.size() > 0) {
for (ThrCorpsResponse erpUnitsResponse : imports) {
ThrUnitMaintainResponse thrUnitMaintainResponse = new ThrUnitMaintainResponse();
if (unitMaintainFilterRequest.getThirdSys() != null) {
if ("thirdId".equals(unitMaintainFilterRequest.getThirdSys())) {
thrUnitMaintainResponse.setThirdId(erpUnitsResponse.getId());
thrUnitMaintainResponse.setThirdName(erpUnitsResponse.getName());
} else if ("thirdId1".equals(unitMaintainFilterRequest.getThirdSys())) {
thrUnitMaintainResponse.setThirdId1(erpUnitsResponse.getId());
thrUnitMaintainResponse.setThirdName1(erpUnitsResponse.getName());
} else if ("thirdId2".equals(unitMaintainFilterRequest.getThirdSys())) {
thrUnitMaintainResponse.setThirdId2(erpUnitsResponse.getId());
thrUnitMaintainResponse.setThirdName2(erpUnitsResponse.getName());
} else if ("thirdId3".equals(unitMaintainFilterRequest.getThirdSys())) {
thrUnitMaintainResponse.setThirdId3(erpUnitsResponse.getId());
thrUnitMaintainResponse.setThirdName3(erpUnitsResponse.getName());
} else if ("thirdId4".equals(unitMaintainFilterRequest.getThirdSys())) {
thrUnitMaintainResponse.setThirdId4(erpUnitsResponse.getId());
thrUnitMaintainResponse.setThirdName4(erpUnitsResponse.getName());
}
}
thrUnitMaintainResponse.setErpId(CustomUtil.getId());
thrUnitMaintainResponse.setName(erpUnitsResponse.getName());
if (erpUnitsResponse.getSpell() == null || "".equals(erpUnitsResponse.getSpell())) {
thrUnitMaintainResponse.setSpell(PinyinUtil.getFirstLetter(erpUnitsResponse.getName(), "").toUpperCase(Locale.ROOT));
} else {
thrUnitMaintainResponse.setSpell(erpUnitsResponse.getSpell());
}
thrUnitMaintainResponse.setAddr(erpUnitsResponse.getAddr());
thrUnitMaintainResponse.setCreditNo(erpUnitsResponse.getCreditNo());
thrUnitMaintainResponse.setCorpType(ConstantStatus.CORP_SP);
thrUnitMaintainResponse.setContact(erpUnitsResponse.getContact());
thrUnitMaintainResponse.setMobile(erpUnitsResponse.getMobile());
thrUnitMaintainResponse.setUpdateTime(new Date());
basicCorpService.insertThrUnitMaintainignore(thrUnitMaintainResponse);
}
}
}
}

@ -109,8 +109,8 @@
)
</insert>
<insert id="insertBasicUnitMaintainignore" keyProperty="id"
parameterType="com.glxp.api.entity.basic.BasicCorpEntity">
<insert id="insertThrUnitMaintainignore" keyProperty="id"
parameterType="com.glxp.api.res.thrsys.ThrUnitMaintainResponse">
insert
ignore
INTO basic_corp

@ -9,8 +9,8 @@
(select employeeName from auth_user au where au.id = io.createUser) createUserName,
(select employeeName from auth_user au2 where au2.id = io.updateUser) updateUserName,
(select employeeName from auth_user au3 where au3.id = io.auditUser) auditUserName,
(select name from auth_dept ad2 where ad2.code = io.targetDeptCode) fromDeptName,
(select name from auth_warehouse aw2 where aw2.code = io.targetDeptCode) fromInvName
(select name from auth_dept ad2 where ad2.code = io.targetDeptCode) targetDeptName,
(select name from auth_warehouse aw2 where aw2.code = io.targetInvCode) targetInvName
from pur_receive as io
<where>
<if test="billType != null and billType != ''">

@ -17,5 +17,22 @@
AND orderIdFk = #{orderIdFk}
</if>
</where>
GROUP BY basic_udirel.uuid
</select>
<update id="updateReceiveDetail" parameterType="com.glxp.api.req.inout.UpdateReceiveDetailRequest">
UPDATE pur_receive_detail
<trim prefix="set" suffixOverrides=",">
<if test="orderIdFk != null">orderIdFk=#{orderIdFk},</if>
<if test="relIdFk != null">relIdFk=#{relIdFk},</if>
<if test="nameCode != null">nameCode=#{nameCode},</if>
<if test="count != null">count=#{count},</if>
<if test="supId != null">supId=#{supId},</if>
<if test="productDate != null">productDate=#{productDate},</if>
<if test="batchNo != null">batchNo=#{batchNo},</if>
<if test="expireDate != null">expireDate=#{expireDate},</if>
</trim>
WHERE id = #{id}
</update>
</mapper>

Loading…
Cancel
Save