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

bug修改

Browse Source
master
anthonyywj2 3 years ago
parent 12cb132a20
commit 6d002907f4
15 changed files with 179 additions and 55 deletions
Show Stats Download Patch File Download Diff File

9
api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java
Unescape Escape View File

@ -99,8 +99,8 @@ public class StockQRCodeTextController {
for (StockQRCodeTextEntity stockQRCodeTextEntity : stockQRCodeTextEntityList) { for (StockQRCodeTextEntity stockQRCodeTextEntity : stockQRCodeTextEntityList) {
StockOrderDetailEntity stockOrderDetailEntity = stockOrderDetailService.findOne(stockQRCodeTextEntity.getDetailId()); StockOrderDetailEntity stockOrderDetailEntity = stockOrderDetailService.findOne(stockQRCodeTextEntity.getDetailId());
if (stockOrderDetailEntity != null) { if (stockOrderDetailEntity != null) {
stockQRCodeTextEntity.setCount(stockOrderDetailEntity.getCount()+""); stockQRCodeTextEntity.setCount(stockOrderDetailEntity.getCount() + "");
stockQRCodeTextEntity.setReCount(stockOrderDetailEntity.getReCount()+""); stockQRCodeTextEntity.setReCount(stockOrderDetailEntity.getReCount() + "");
} else { } else {
stockQRCodeTextEntity.setCount("0"); stockQRCodeTextEntity.setCount("0");
stockQRCodeTextEntity.setReCount("0"); stockQRCodeTextEntity.setReCount("0");
@ -365,9 +365,10 @@ public class StockQRCodeTextController {
List<StockOrderPrintEntity> list = stockOrderService.listOrderPrint(stockQRCodeTextPDFTemplateRequest.getId()); List<StockOrderPrintEntity> list = stockOrderService.listOrderPrint(stockQRCodeTextPDFTemplateRequest.getId());
if (list != null && list.size() > 0) { if (list != null && list.size() > 0) {
int index = 1; int index = 1;
CompanyEntity companyEntity = companyService.findCompany();
for (StockOrderPrintEntity stockOrderPrintEntity : list) { for (StockOrderPrintEntity stockOrderPrintEntity : list) {
stockOrderPrintEntity.setIndex(index + ""); stockOrderPrintEntity.setIndex(index + "");
stockOrderPrintEntity.setTitle(stockOrderPrintEntity.getCorpName()); stockOrderPrintEntity.setCorpName(stockOrderPrintEntity.getCorpName());
// StockOrderPrintResponse stockOrderPrintResponse = new StockOrderPrintResponse(); // StockOrderPrintResponse stockOrderPrintResponse = new StockOrderPrintResponse();
// BeanUtils.copyProperties(stockOrderPrintEntity, stockOrderPrintResponse); // BeanUtils.copyProperties(stockOrderPrintEntity, stockOrderPrintResponse);
// stockOrderPrintResponse.setPrice(stockOrderPrintEntity.getPrice()); // stockOrderPrintResponse.setPrice(stockOrderPrintEntity.getPrice());
@ -375,7 +376,7 @@ public class StockQRCodeTextController {
// stockOrderPrintEntity.setAmount(BigDecimal.valueOf(85.36)); // stockOrderPrintEntity.setAmount(BigDecimal.valueOf(85.36));
// stockOrderPrintEntity.setTotalPrice(BigDecimal.valueOf(1888.88)); // stockOrderPrintEntity.setTotalPrice(BigDecimal.valueOf(1888.88));
// stockOrderPrintEntity.setTotalPriceWord("18888"); // stockOrderPrintEntity.setTotalPriceWord("18888");
// stockOrderPrintEntity.setCorpName(companyEntity.getCompanyName()); stockOrderPrintEntity.setTitle(companyEntity.getName());
stockOrderPrintEntity.setOrderName(stockQRCodeTextPDFTemplateRequest.getOrderName()); stockOrderPrintEntity.setOrderName(stockQRCodeTextPDFTemplateRequest.getOrderName());
index++; index++;
// stockOrderPrintResponses.add(stockOrderPrintResponse); // stockOrderPrintResponses.add(stockOrderPrintResponse);

17
api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java
Unescape Escape View File

@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil; import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil;
import com.glxp.api.admin.controller.inout.utils.DataTransUtil;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity; import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
@ -632,7 +633,21 @@ public class OrderDetailController {
OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
orderFilterRequest.setId(filterErpOrderRequest.getOrderId()); orderFilterRequest.setId(filterErpOrderRequest.getOrderId());
OrderEntity orderEntity = orderService.findOne(orderFilterRequest); OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
transInoutService.repeatCheck(orderEntity.getId());
transInoutService.transStatus(orderEntity.getId());
orderEntity = orderService.findById(orderEntity.getId());
List<String> erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk());
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK) {
if (erpIds != null && erpIds.size() > 0) { //已经绑定ERPID，则自动校验
transInoutService.repeatCheck(orderEntity.getId());
} else {
//未绑定Id,则更改状态，等待校验
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
orderService.updateOrder(orderEntity);
}
}
return ResultVOUtils.success("后台已开始校验，请稍后刷新重试！"); return ResultVOUtils.success("后台已开始校验，请稍后刷新重试！");
} }

18
api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java
Unescape Escape View File

@ -9,6 +9,7 @@ import com.glxp.api.admin.entity.basic.UdiEntity;
import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.entity.basic.UdiInfoEntity;
import com.glxp.api.admin.entity.info.CompanyEntity; import com.glxp.api.admin.entity.info.CompanyEntity;
import com.glxp.api.admin.entity.inout.OrderEntity; import com.glxp.api.admin.entity.inout.OrderEntity;
import com.glxp.api.admin.entity.inout.WarehouseUserEntity;
import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; import com.glxp.api.admin.entity.inventory.InvProductDetailEntity;
import com.glxp.api.admin.entity.inventory.InvProductEntity; import com.glxp.api.admin.entity.inventory.InvProductEntity;
import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.req.inout.DeleteRequest;
@ -21,10 +22,12 @@ import com.glxp.api.admin.res.inventory.InvProductDetailResponse;
import com.glxp.api.admin.res.inventory.InvProductPageRespnonse; import com.glxp.api.admin.res.inventory.InvProductPageRespnonse;
import com.glxp.api.admin.res.inventory.InvProductResponse; import com.glxp.api.admin.res.inventory.InvProductResponse;
import com.glxp.api.admin.res.inventory.InvProductStatResponse; import com.glxp.api.admin.res.inventory.InvProductStatResponse;
import com.glxp.api.admin.service.auth.CustomerService;
import com.glxp.api.admin.service.basic.UdiInfoService; import com.glxp.api.admin.service.basic.UdiInfoService;
import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.basic.UdiRelevanceService;
import com.glxp.api.admin.service.info.CompanyService; import com.glxp.api.admin.service.info.CompanyService;
import com.glxp.api.admin.service.inout.OrderService; import com.glxp.api.admin.service.inout.OrderService;
import com.glxp.api.admin.service.inout.WarehouseUserService;
import com.glxp.api.admin.service.inventory.InvProductDetailService; import com.glxp.api.admin.service.inventory.InvProductDetailService;
import com.glxp.api.admin.service.inventory.InvProductService; import com.glxp.api.admin.service.inventory.InvProductService;
import com.glxp.api.admin.util.FilterUdiUtils; import com.glxp.api.admin.util.FilterUdiUtils;
@ -64,10 +67,25 @@ public class InvProductsController {
private UdiInfoService udiInfoService; private UdiInfoService udiInfoService;
@Resource @Resource
private CompanyService companyService; private CompanyService companyService;
@Resource
private WarehouseUserService warehouseUserService;
@Resource
CustomerService customerService;
@GetMapping("spms/inv/products/filter") @GetMapping("spms/inv/products/filter")
public BaseResponse filterInvProduct(FilterInvProductRequest filterInvProductRequest) { public BaseResponse filterInvProduct(FilterInvProductRequest filterInvProductRequest) {
boolean showSup = false; boolean showSup = false;
if (StrUtil.isEmpty(filterInvProductRequest.getInvStorageCode())) {
List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.selectCodeByUser(customerService.getUserId() + "");
if (!warehouseUserEntities.isEmpty()) {
List<String> invCodes = new ArrayList<>();
warehouseUserEntities.forEach(warehouseUserEntity -> {
invCodes.add(warehouseUserEntity.getCode());
});
filterInvProductRequest.setInvCodes(invCodes);
}
}
List<InvProductResponse> invProductResponses = invProductService.filterJoinInvProduct(filterInvProductRequest); List<InvProductResponse> invProductResponses = invProductService.filterJoinInvProduct(filterInvProductRequest);
PageInfo<InvProductResponse> pageInfo; PageInfo<InvProductResponse> pageInfo;
pageInfo = new PageInfo<>(invProductResponses); pageInfo = new PageInfo<>(invProductResponses);

32
api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java
Unescape Escape View File

@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest;
import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.req.inout.DeleteRequest;
@ -14,6 +15,7 @@ import com.glxp.api.admin.res.inventory.InvWarehouseExportResponse;
import com.glxp.api.admin.res.inventory.InvWarehouseResponse; import com.glxp.api.admin.res.inventory.InvWarehouseResponse;
import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse; import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse;
import com.glxp.api.admin.service.auth.CustomerService; import com.glxp.api.admin.service.auth.CustomerService;
import com.glxp.api.admin.service.info.SystemParamConfigService;
import com.glxp.api.admin.service.inventory.InvWarehouseService; import com.glxp.api.admin.service.inventory.InvWarehouseService;
import com.glxp.api.admin.util.DateUtil; import com.glxp.api.admin.util.DateUtil;
import com.glxp.api.admin.util.FileUtils; import com.glxp.api.admin.util.FileUtils;
@ -43,6 +45,8 @@ public class InvWarehouseController {
InvWarehouseService invWarehouseService; InvWarehouseService invWarehouseService;
@Resource @Resource
CustomerService customerService; CustomerService customerService;
@Resource
SystemParamConfigService systemParamConfigService;
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filter") @GetMapping("spms/inv/warehouse/filter")
@ -63,6 +67,34 @@ public class InvWarehouseController {
return ResultVOUtils.success(invWarehouseEntities); return ResultVOUtils.success(invWarehouseEntities);
} }
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filterAllLocInv")
public BaseResponse filterAllLocInv(FilterInvWarehouseRequest filterInvWarehouseRequest) {
filterInvWarehouseRequest.setPid(0);
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest);
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv");
List<InvWarehouseEntity> temps = new ArrayList<>();
if (systemParamConfigEntity.getParamValue().equals("1")) {
for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) {
if (!invWarehouseEntity.getCode().equals(filterInvWarehouseRequest.getLocInvCode())) {
temps.add(invWarehouseEntity);
}
}
return ResultVOUtils.success(temps);
} else {
InvWarehouseEntity curEntity = invWarehouseService.selectByCode(filterInvWarehouseRequest.getLocInvCode());
for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) {
if (!StrUtil.isEmpty(curEntity.getPcode()) && curEntity.getPcode().equals(invWarehouseEntity.getCode())) {
temps.add(invWarehouseEntity);
} else if (!StrUtil.isEmpty(invWarehouseEntity.getPcode()) && invWarehouseEntity.getPcode().equals(curEntity.getCode())) {
temps.add(invWarehouseEntity);
}
}
return ResultVOUtils.success(temps);
}
}
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filterAllByUser") @GetMapping("spms/inv/warehouse/filterAllByUser")
public BaseResponse filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { public BaseResponse filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {

2
api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java
Unescape Escape View File

@ -30,6 +30,8 @@ public interface WarehouseUserDao {
List<WarehouseUserEntity> selectListByCode(@Param("code") String code); List<WarehouseUserEntity> selectListByCode(@Param("code") String code);
List<WarehouseUserEntity> selectCodeByUser(@Param("userId") String userId);
void deleteByCode(@Param("code") String code); void deleteByCode(@Param("code") String code);
/** /**

4
api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductRequest.java
Unescape Escape View File

@ -3,6 +3,8 @@ package com.glxp.api.admin.req.inventory;
import com.glxp.api.admin.req.ListPageRequest; import com.glxp.api.admin.req.ListPageRequest;
import lombok.Data; import lombok.Data;
import java.util.List;
@Data @Data
public class FilterInvProductRequest extends ListPageRequest { public class FilterInvProductRequest extends ListPageRequest {
@ -33,5 +35,5 @@ public class FilterInvProductRequest extends ListPageRequest {
//货位码 //货位码
private String invWarehouseCode; private String invWarehouseCode;
private String groupType; private String groupType;
private List<String> invCodes;
} }

2
api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvWarehouseRequest.java
Unescape Escape View File

@ -16,7 +16,7 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
private Boolean isDefault; private Boolean isDefault;
private Date updateTime; private Date updateTime;
private String key; private String key;
private String locInvCode;
private Integer level; private Integer level;
private String pcode; private String pcode;

2
api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java
Unescape Escape View File

@ -16,6 +16,8 @@ public interface WarehouseUserService {
*/ */
List<WarehouseUserEntity> getListByCode(String code); List<WarehouseUserEntity> getListByCode(String code);
List<WarehouseUserEntity> selectCodeByUser(String userId);
/** /**
* 新增仓库字典，用户关联数据 * 新增仓库字典，用户关联数据
* *

11
api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java
Unescape Escape View File

@ -13,11 +13,13 @@ import com.glxp.api.admin.dao.inout.CodesDao;
import com.glxp.api.admin.dao.inventory.InvWarehouseDao; import com.glxp.api.admin.dao.inventory.InvWarehouseDao;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity; import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
import com.glxp.api.admin.entity.business.StockOrderEntity; import com.glxp.api.admin.entity.business.StockOrderEntity;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
import com.glxp.api.admin.entity.inout.OrderEntity; import com.glxp.api.admin.entity.inout.OrderEntity;
import com.glxp.api.admin.entity.inout.WarehouseEntity; import com.glxp.api.admin.entity.inout.WarehouseEntity;
import com.glxp.api.admin.req.inout.OrderFilterRequest; import com.glxp.api.admin.req.inout.OrderFilterRequest;
import com.glxp.api.admin.req.inout.OrderQueryRequest; import com.glxp.api.admin.req.inout.OrderQueryRequest;
import com.glxp.api.admin.res.inout.StockOrderResponse; import com.glxp.api.admin.res.inout.StockOrderResponse;
import com.glxp.api.admin.service.info.SystemParamConfigService;
import com.glxp.api.admin.service.inout.OrderService; import com.glxp.api.admin.service.inout.OrderService;
import com.glxp.api.admin.util.CustomUtil; import com.glxp.api.admin.util.CustomUtil;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
@ -47,6 +49,8 @@ public class OrderServiceImpl implements OrderService {
CodesDao codesDao; CodesDao codesDao;
@Resource @Resource
CodesTempDao codesTempDao; CodesTempDao codesTempDao;
@Resource
SystemParamConfigService systemParamConfigService;
@Override @Override
public List<OrderEntity> listOrders(OrderQueryRequest orderQueryRequest) { public List<OrderEntity> listOrders(OrderQueryRequest orderQueryRequest) {
@ -202,7 +206,12 @@ public class OrderServiceImpl implements OrderService {
supplementOrder.setSupplementNo(order.getId()); supplementOrder.setSupplementNo(order.getId());
supplementOrder.setId(supplementOrderNo); supplementOrder.setId(supplementOrderNo);
//修改状态 //修改状态
supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL); //设置状态为补录单据 SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit");
if ("1".equals(systemParamConfigEntity.getParamValue())) {
supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); //设置状态为补录单据
} else {
supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL); //设置状态为补录单据
}
supplementOrder.setExportStatus(0); //设置导出状态为未导出 supplementOrder.setExportStatus(0); //设置导出状态为未导出
supplementOrder.setContrastStatus(0);//设置erp校验状态为未校验 supplementOrder.setContrastStatus(0);//设置erp校验状态为未校验
supplementOrder.setReceiveStatus(0); //设置验收状态为未验收 supplementOrder.setReceiveStatus(0); //设置验收状态为未验收

5
api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java
Unescape Escape View File

@ -30,6 +30,11 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
return warehouseUserEntities; return warehouseUserEntities;
} }
@Override
public List<WarehouseUserEntity> selectCodeByUser(String userId) {
return warehouseUserDao.selectCodeByUser(userId);
}
@Override @Override
public void saveWarehouseUser(String code, List<AuthAdmin> userList) { public void saveWarehouseUser(String code, List<AuthAdmin> userList) {
if (CollUtil.isNotEmpty(userList)) { if (CollUtil.isNotEmpty(userList)) {

49
api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java
Unescape Escape View File

@ -231,7 +231,8 @@ public class InvProductsTrService {
//获取当前条码实际数量 //获取当前条码实际数量
int actCount = getActCount(warehouseEntity); int actCount = getActCount(warehouseEntity);
int count = 0; int count = 0;
UdiInfoEntity udiInfoEntity = getMinDi(warehouseEntity); // UdiInfoEntity udiInfoEntity = getMinDi(warehouseEntity);
String code = warehouseEntity.getCode(); String code = warehouseEntity.getCode();
count = actCount * warehouseEntity.getCount(); count = actCount * warehouseEntity.getCount();
/** /**
@ -251,7 +252,7 @@ public class InvProductsTrService {
invWarehouseEntity = invWarehouseService.findDefault(true, true); invWarehouseEntity = invWarehouseService.findDefault(true, true);
int invCount = getCountByOrder(null, udiInfoEntity.getRelId(), warehouseEntity.getBatchNo(), warehouseEntity.getSupId(), warehouseEntity.getLocStorageCode()); int invCount = getCountByOrder(null, warehouseEntity);
warehouseEntity.setFromCorpId(invWarehouseEntity.getCode()); warehouseEntity.setFromCorpId(invWarehouseEntity.getCode());
warehouseEntity.setFromCorp(invWarehouseEntity.getName()); warehouseEntity.setFromCorp(invWarehouseEntity.getName());
if (invCount > 0) {//仓库已存在该产品 if (invCount > 0) {//仓库已存在该产品
@ -296,7 +297,7 @@ public class InvProductsTrService {
warehouseEntity.setFromCorp(pInWarehouseEntity.getName()); warehouseEntity.setFromCorp(pInWarehouseEntity.getName());
warehouseEntity.setFromCorpId(pInWarehouseEntity.getCode()); warehouseEntity.setFromCorpId(pInWarehouseEntity.getCode());
invCount = getCountByOrder(null, udiInfoEntity.getRelId(), warehouseEntity.getBatchNo(), warehouseEntity.getSupId(), warehouseEntity.getLocStorageCode()); invCount = getCountByOrder(null, warehouseEntity);
// invCount = getCountByOrder(null, warehouseEntity.getCode(), warehouseEntity.getSupId(), locWarehouseEntity.getPcode()); // invCount = getCountByOrder(null, warehouseEntity.getCode(), warehouseEntity.getSupId(), locWarehouseEntity.getPcode());
// if (invCount <= 0) { // if (invCount <= 0) {
// invCount = getCountByOrder(null, code, warehouseEntity.getSupId(), locWarehouseEntity.getPcode()); // invCount = getCountByOrder(null, code, warehouseEntity.getSupId(), locWarehouseEntity.getPcode());
@ -310,7 +311,7 @@ public class InvProductsTrService {
warehouseEntity.setFromCorpId(warehouseEntity.getSupId()); warehouseEntity.setFromCorpId(warehouseEntity.getSupId());
BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(warehouseEntity.getSupId()); BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(warehouseEntity.getSupId());
warehouseEntity.setFromCorp(basicUnitMaintainEntity.getName()); warehouseEntity.setFromCorp(basicUnitMaintainEntity.getName());
invCount = getCountByOrder(null, udiInfoEntity.getRelId(), warehouseEntity.getBatchNo(), warehouseEntity.getSupId(), warehouseEntity.getLocStorageCode()); invCount = getCountByOrder(null, warehouseEntity);
// invCount = getCountByOrder(null, warehouseEntity.getCode(), warehouseEntity.getSupId(), null); // invCount = getCountByOrder(null, warehouseEntity.getCode(), warehouseEntity.getSupId(), null);
// if (invCount <= 0) { // if (invCount <= 0) {
@ -1001,13 +1002,13 @@ public class InvProductsTrService {
int actCount = getActCount(warehouseEntity); int actCount = getActCount(warehouseEntity);
String code = warehouseEntity.getCode(); String code = warehouseEntity.getCode();
UdiInfoEntity udiInfoEntity = getMinDi(warehouseEntity); // UdiInfoEntity udiInfoEntity = getMinDi(warehouseEntity);
if (udiInfoEntity.getDiType() == ConstantStatus.DITYPE_PACK || udiInfoEntity.getDiType() == ConstantStatus.DITYPE_SYDY // if (udiInfoEntity.getDiType() == ConstantStatus.DITYPE_PACK || udiInfoEntity.getDiType() == ConstantStatus.DITYPE_SYDY
|| (udiInfoEntity.getSjcpbm() != null && !"".equals(udiInfoEntity.getSjcpbm()))) { // || (udiInfoEntity.getSjcpbm() != null && !"".equals(udiInfoEntity.getSjcpbm()))) {
warehouseEntity.setNameCode(udiInfoEntity.getNameCode()); // warehouseEntity.setNameCode(udiInfoEntity.getNameCode());
code = FilterUdiUtils.transGlxpNoSerStr(warehouseEntity); // code = FilterUdiUtils.transGlxpNoSerStr(warehouseEntity);
warehouseEntity.setCode(code); // warehouseEntity.setCode(code);
} // }
invProductDetailEntity.setCode(code); invProductDetailEntity.setCode(code);
invProductDetailEntity.setBatchNo(warehouseEntity.getBatchNo()); invProductDetailEntity.setBatchNo(warehouseEntity.getBatchNo());
invProductDetailEntity.setProductionDate(warehouseEntity.getProduceDate()); invProductDetailEntity.setProductionDate(warehouseEntity.getProduceDate());
@ -1017,7 +1018,7 @@ public class InvProductsTrService {
invProductDetailEntity.setInvStorageCode(warehouseEntity.getInvStorageCode()); invProductDetailEntity.setInvStorageCode(warehouseEntity.getInvStorageCode());
invProductDetailEntity.setInvWarehouseCode(warehouseEntity.getWarehouseCode()); invProductDetailEntity.setInvWarehouseCode(warehouseEntity.getWarehouseCode());
invProductDetailEntity.setOrderIdFk(warehouseEntity.getOrderId()); invProductDetailEntity.setOrderIdFk(warehouseEntity.getOrderId());
invProductDetailEntity.setCount(actCount * warehouseEntity.getCount()); invProductDetailEntity.setCount(warehouseEntity.getCount());
if (purchaseType != null) { if (purchaseType != null) {
invProductDetailEntity.setPurchaseType(purchaseType); invProductDetailEntity.setPurchaseType(purchaseType);
} }
@ -1084,9 +1085,10 @@ public class InvProductsTrService {
} }
public int getActCount(WarehouseEntity warehouseEntity) { public int getActCount(WarehouseEntity warehouseEntity) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(warehouseEntity.getRelId());
UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(warehouseEntity.getNameCode()); UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(warehouseEntity.getNameCode());
if (udiInfoBean != null) { if (udiInfoBean != null) {
if (udiInfoBean.getIsUseDy() == 1 && udiInfoBean.getDiType() != 2) { if ((udiRelevanceEntity.getIsUseDy()!=null && udiRelevanceEntity.getIsUseDy()) && udiInfoBean.getDiType() != 2) {
if (udiInfoBean.getBhzxxsbzsl() == 0) if (udiInfoBean.getBhzxxsbzsl() == 0)
return udiInfoBean.getZxxsbzbhsydysl(); return udiInfoBean.getZxxsbzbhsydysl();
else else
@ -1143,6 +1145,11 @@ public class InvProductsTrService {
return null; return null;
} }
public UdiRelevanceResponse getUdiInfo(WarehouseEntity warehouseEntity) {
UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(warehouseEntity.getNameCode());
return udiInfoBean;
}
//根据条码获取库存结余数量 //根据条码获取库存结余数量
public int getCountByOrder(String mainAction, String code, String supId, String invWarehouseCode) { public int getCountByOrder(String mainAction, String code, String supId, String invWarehouseCode) {
@ -1168,12 +1175,18 @@ public class InvProductsTrService {
return invCount; return invCount;
} }
public int getCountByOrder(String mainAction, String relId, String batchNo, String supId, String invWarehouseCode) { public int getCountByOrder(String mainAction, WarehouseEntity warehouseEntity) {
FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
filterInvProductDetailRequest.setSupId(supId); UdiRelevanceResponse udiRelevanceResponse = getUdiInfo(warehouseEntity);
filterInvProductDetailRequest.setInvStorageCode(invWarehouseCode); UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(warehouseEntity.getRelId());
filterInvProductDetailRequest.setProductIdFk(relId); if (warehouseEntity.getSerialNo() != null && udiRelevanceResponse.getDiType() == 1 && (udiRelevanceEntity.getIsUseDy()==null || !udiRelevanceEntity.getIsUseDy())) {
filterInvProductDetailRequest.setBatchNo(batchNo); filterInvProductDetailRequest.setCode(warehouseEntity.getCode());
} else {
filterInvProductDetailRequest.setProductIdFk(warehouseEntity.getRelId());
filterInvProductDetailRequest.setBatchNo(warehouseEntity.getBatchNo());
}
filterInvProductDetailRequest.setSupId(warehouseEntity.getSupId());
filterInvProductDetailRequest.setInvStorageCode(warehouseEntity.getLocStorageCode());
if (mainAction != null) if (mainAction != null)
filterInvProductDetailRequest.setMainAction(mainAction); filterInvProductDetailRequest.setMainAction(mainAction);
List<InvProductDetailEntity> resultLists = invProductDetailService.filterInvProduct(filterInvProductDetailRequest); List<InvProductDetailEntity> resultLists = invProductDetailService.filterInvProduct(filterInvProductDetailRequest);

64
api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java
Unescape Escape View File

@ -310,7 +310,8 @@ public class IoTransInoutService {
if (udiEntity.getExpireDate() != null) { if (udiEntity.getExpireDate() != null) {
String expireDate = "20" + udiEntity.getExpireDate(); String expireDate = "20" + udiEntity.getExpireDate();
long expireTime = DateUtil.parseDateExpire(expireDate); long expireTime = DateUtil.parseDateExpire(expireDate);
if (expireTime - System.currentTimeMillis() < recent * 24 * 60 * 60 * 1000) { long curTime = System.currentTimeMillis();
if ((expireTime - curTime) > 0 && (expireTime - curTime) < recent * 24 * 60 * 60 * 1000) {
orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL); orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);
orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "临近过期！"); orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "临近过期！");
return; return;
@ -511,7 +512,7 @@ public class IoTransInoutService {
} }
genOrderDetail(warehouseEntityList); genOrderDetail(warehouseEntityList);
checkMutiDi(orderEntity.getId()); //校验一个DI是否绑定多个产品ID checkMutiDi(orderEntity.getId(), bussinessTypeEntity); //校验一个DI是否绑定多个产品ID
orderEntity = orderService.findById(orderEntity.getId()); orderEntity = orderService.findById(orderEntity.getId());
if (orderEntity.getContrastStatus() != ConstantStatus.ORDER_CHECK_FAIL) { if (orderEntity.getContrastStatus() != ConstantStatus.ORDER_CHECK_FAIL) {
orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_CHECK); orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_CHECK);
@ -521,8 +522,9 @@ public class IoTransInoutService {
//无需校验，已完成 //无需校验，已完成
public void unCheckFinish(OrderEntity orderEntity, List<WarehouseEntity> warehouseEntityList) { public void unCheckFinish(OrderEntity orderEntity, List<WarehouseEntity> warehouseEntityList) {
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
genOrderDetail(warehouseEntityList); genOrderDetail(warehouseEntityList);
checkMutiDi(orderEntity.getId()); //校验一个DI是否绑定多个产品ID checkMutiDi(orderEntity.getId(), bussinessTypeEntity); //校验一个DI是否绑定多个产品ID
orderEntity = orderService.findById(orderEntity.getId()); orderEntity = orderService.findById(orderEntity.getId());
if (orderEntity.getContrastStatus() != ConstantStatus.ORDER_CHECK_FAIL) { if (orderEntity.getContrastStatus() != ConstantStatus.ORDER_CHECK_FAIL) {
List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterAllByOrderIdFk(orderEntity.getId()); List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterAllByOrderIdFk(orderEntity.getId());
@ -606,51 +608,63 @@ public class IoTransInoutService {
} }
public void checkMutiDi(String orderId) { public void checkMutiDi(String orderId, BussinessTypeEntity bussinessTypeEntity) {
//校验是否di绑定多个产品ID
OrderEntity orderEntity = orderService.findById(orderId); OrderEntity orderEntity = orderService.findById(orderId);
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
filterErpOrderRequest.setOrderId(orderId); filterErpOrderRequest.setOrderId(orderId);
List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest); List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest);
int checkStatus = ConstantStatus.ORDER_STATUS_CHECK;
if (erpOrderEntities != null && erpOrderEntities.size() > 0) { if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
for (ErpOrderEntity erpOrderEntity : erpOrderEntities) { for (ErpOrderEntity erpOrderEntity : erpOrderEntities) {
WarehouseEntity warehouseEntity = warehouseService.findOneByNameCode(erpOrderEntity.getOrderIdFk(), erpOrderEntity.getNameCode());
if (warehouseEntity != null && warehouseEntity.getStatus() == ConstantStatus.ORDER_DETAIL_DI_MUTI) { //校验DI是否绑定多个产品ID
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setNameCode(erpOrderEntity.getNameCode());
List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && erpOrderEntity.getBindRlFk() == null) {
erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI); erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
myErpOrderService.updateErpOrder(erpOrderEntity); myErpOrderService.updateErpOrder(erpOrderEntity);
if (warehouseEntity.getRelId() == null) { orderEntity.setRemark("该产品维护多个产品信息，请在扫码单据详情绑定对应产品产品信息");
orderEntity.setRemark("该产品DI绑定多个产品ID，请在扫码单据详情绑定对应产品ID"); checkStatus = ConstantStatus.ORDER_CHECK_FAIL;
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
orderService.updateOrder(orderEntity);
}
} else { } else {
if (!bussinessTypeEntity.isInnerOrder()) { if ((erpOrderEntity.getSupId() == null || erpOrderEntity.getSupId().equals("MUTI"))) {
if (erpOrderEntity.getSupId() == null) { if (erpOrderEntity.getSupId() == null) {
erpOrderEntity.setSupId(null);
erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_SUP_NONE); erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_SUP_NONE);
orderEntity.setRemark("该产品未绑定供应商"); orderEntity.setRemark("该产品未指定供应商");
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); } else {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
orderService.updateOrder(orderEntity);
} else if (Constant.MUTI.equals(erpOrderEntity.getSupId())) {
erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_SUP_MUTI); erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_SUP_MUTI);
orderEntity.setRemark("该产品绑定多个供应商"); orderEntity.setRemark("该产品指定多个供应商");
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); }
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); checkStatus = ConstantStatus.ORDER_CHECK_FAIL;
} else {
CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findByUdiRlIdUnitFk(erpOrderEntity.getBindRlFk(), erpOrderEntity.getSupId());
if (companyProductRelevanceEntity == null) {
orderEntity.setRemark(erpOrderEntity.getCoName() + "该产品非此供应商配送");
checkStatus = ConstantStatus.ORDER_CHECK_FAIL;
} else { } else {
orderEntity.setContrastStatus(checkStatus);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
orderService.updateOrder(orderEntity);
erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_SUP_ONE); erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_SUP_ONE);
} }
} }
myErpOrderService.updateErpOrder(erpOrderEntity);
} }
myErpOrderService.updateErpOrder(erpOrderEntity);
} }
orderEntity.setContrastStatus(checkStatus);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
orderService.updateOrder(orderEntity);
} }
} }

8
api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml
Unescape Escape View File

@ -242,10 +242,14 @@
<select id="selectListByCode" resultMap="BaseResultMap"> <select id="selectListByCode" resultMap="BaseResultMap">
select inv_warehouse_user.*, auth_user.employeeName select inv_warehouse_user.*, auth_user.employeeName
from inv_warehouse_user from inv_warehouse_user
inner join auth_user on auth_user.id = inv_warehouse_user.userId inner join auth_user on auth_user.id = inv_warehouse_user.userId
where code = #{code} where code = #{code}
</select> </select>
<select id="selectCodeByUser" resultMap="BaseResultMap">
select inv_warehouse_user.*
from inv_warehouse_user
where userId = #{userId}
</select>
<delete id="deleteByCode"> <delete id="deleteByCode">
delete delete
from inv_warehouse_user from inv_warehouse_user

6
api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
Unescape Escape View File

@ -149,6 +149,12 @@
<if test="invWarehouseCode != '' and invWarehouseCode != null"> <if test="invWarehouseCode != '' and invWarehouseCode != null">
AND invWarehouseCode = #{invWarehouseCode} AND invWarehouseCode = #{invWarehouseCode}
</if> </if>
<if test="invCodes != null and invCodes.size > 0">
AND invStorageCode IN
<foreach collection="invCodes" item="id" index="index" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where> </where>
<if test="groupType != '' and groupType != null"> <if test="groupType != '' and groupType != null">

5
api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml
Unescape Escape View File

@ -119,7 +119,8 @@
parameterType="com.glxp.api.admin.entity.inventory.InvProductDetailEntity"> parameterType="com.glxp.api.admin.entity.inventory.InvProductDetailEntity">
insert INTO inv_product_detail insert INTO inv_product_detail
(code, productIdFk, orderIdFk, customerId, mainAction, action, count, updateTime, (code, productIdFk, orderIdFk, customerId, mainAction, action, count, updateTime,
purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId,originCode) purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId,originCode
,invStorageCode,invWarehouseCode)
values values
<foreach collection="invProductDetailEntitys" item="item" index="index" <foreach collection="invProductDetailEntitys" item="item" index="index"
@ -130,7 +131,7 @@
#{item.customerId},#{item.mainAction},#{item.action},#{item.count},#{item.updateTime}, #{item.customerId},#{item.mainAction},#{item.action},#{item.count},#{item.updateTime},
#{item.purchaseType}, #{item.batchNo}, #{item.productionDate}, #{item.expireDate}, #{item.purchaseType}, #{item.batchNo}, #{item.productionDate}, #{item.expireDate},
#{item.unitFk},#{item.stockIdFk} #{item.unitFk},#{item.stockIdFk}
,#{item.supId},#{item.originCode} ,#{item.supId},#{item.originCode},#{item.invStorageCode},#{item.invWarehouseCode}
) )
</foreach> </foreach>

Write Preview
Loading…
Cancel
Save