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

bug修复

Browse Source
master
anthonyywj2 3 years ago
parent 2968c77cf5
commit 6c03d4af96
9 changed files with 101 additions and 36 deletions
Show Stats Download Patch File Download Diff File

25
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.sale.admin.controller.basic;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.constant.Constant;
import com.glxp.sale.admin.entity.auth.AuthAdmin;
@ -8,6 +9,7 @@ import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
import com.glxp.sale.admin.entity.inout.StockOrderEntity;
import com.glxp.sale.admin.exception.JsonException;
import com.glxp.sale.admin.req.basic.BusNoUserRequest;
import com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest;
import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest;
import com.glxp.sale.admin.req.info.DeleteRequest;
@ -32,6 +34,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
@RestController
@ -109,19 +112,25 @@ public class BussinessLocalTypeController {
@GetMapping("/udiwms/localBusType/filterUnUse")
public BaseResponse filterUnUse(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest,
BindingResult bindingResult) {
public BaseResponse filterUnUse(BusNoUserRequest busNoUserRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
BussinessLocalTypeFilterRequest bussinessTypeFilterRequest = new BussinessLocalTypeFilterRequest();
bussinessTypeFilterRequest.setEnabled(true);
List<BussinessLocalTypeEntity> bussinessTypeEntities;
bussinessTypeEntities = bussinessLocalTypeService.filterList(bussinessTypeFilterRequest);
PageInfo<BussinessLocalTypeEntity> pageInfo;
pageInfo = new PageInfo<>(bussinessTypeEntities);
List<BussinessLocalTypeEntity> returnDatas = new ArrayList<>();
bussinessTypeEntities = bussinessLocalTypeService.filterLeftJoin(bussinessTypeFilterRequest);
for (BussinessLocalTypeEntity bussinessLocalTypeEntity : bussinessTypeEntities) {
if (StrUtil.isEmpty(bussinessLocalTypeEntity.getAction()) || bussinessLocalTypeEntity.getLocalAction().equals(busNoUserRequest.getCurAction())) {
returnDatas.add(bussinessLocalTypeEntity);
}
}
PageSimpleResponse<BussinessLocalTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(bussinessTypeEntities);
pageSimpleResponse.setList(returnDatas);
return ResultVOUtils.success(pageSimpleResponse);
}
@ -140,7 +149,7 @@ public class BussinessLocalTypeController {
List<BussinessLocalTypeEntity> bussinessLocalTypeEntities = bussinessLocalTypeService.filterJoin(bussinessTypeFilterRequest);
if (bussinessLocalTypeEntities != null && bussinessLocalTypeEntities.size() > 0) {
return ResultVOUtils.error(500, "该业务单据类型已被扫码单据类型绑定，无法删除！");
}else{
} else {
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
stockOrderFilterRequest.setBillType(bussinessLocalTypeEntity.getAction());
StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);

2
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/ContrastErpUtil.java
Unescape Escape View File

@ -214,7 +214,7 @@ public class ContrastErpUtil {
if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && erpOrderEntity.getBindRlFk() == null) {
erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
myErpOrderService.updateErpOrder(erpOrderEntity);
errMsg = "该产品DI绑定多个产品ID，请在扫码单据详情绑定对应产品ID";
errMsg = "该产品维护了多个产品信息，请在扫码单据详情绑定对应产品ID";
}
}
return errMsg;

2
api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java
Unescape Escape View File

@ -14,6 +14,8 @@ public interface BussinessLocalTypeDao {
List<BussinessLocalTypeEntity> filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
List<BussinessLocalTypeEntity> filterLeftJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
BussinessLocalTypeEntity findBTByAction(String action);
BussinessLocalTypeEntity findBTByName(String name);

10
api-admin/src/main/java/com/glxp/sale/admin/req/basic/BusNoUserRequest.java
Unescape Escape View File

@ -0,0 +1,10 @@
package com.glxp.sale.admin.req.basic;
import lombok.Data;
@Data
public class BusNoUserRequest {
private String curAction;
}

2
api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessLocalTypeService.java
Unescape Escape View File

@ -13,6 +13,8 @@ public interface BussinessLocalTypeService {
List<BussinessLocalTypeEntity> filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
List<BussinessLocalTypeEntity> filterLeftJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
BussinessLocalTypeEntity findBTByAction(String action);
BussinessLocalTypeEntity findBTByName(String name);

13
api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java
Unescape Escape View File

@ -43,6 +43,19 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService
return data;
}
@Override
public List<BussinessLocalTypeEntity> filterLeftJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest) {
if (bussinessTypeFilterRequest == null) {
return Collections.emptyList();
}
if (bussinessTypeFilterRequest.getPage() != null) {
int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit();
PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit());
}
List<BussinessLocalTypeEntity> data = bussinessLocalTypeDao.filterLeftJoin(bussinessTypeFilterRequest);
return data;
}
@Override
public BussinessLocalTypeEntity findBTByAction(String action) {
BussinessLocalTypeFilterRequest bussinessTypeFilterRequest = new BussinessLocalTypeFilterRequest();

5
api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessTypeServiceImpl.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.sale.admin.service.basic.impl;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper;
import com.glxp.sale.admin.constant.TypeConstant;
import com.glxp.sale.admin.dao.basic.BussinessTypeDao;
@ -114,10 +115,10 @@ public class BussinessTypeServiceImpl implements BussinessTypeService {
public boolean updateBussinessType(BussinessTypeEntity bussinessTypeEntity) {
//更新对应单据类型补单类型
if (bussinessTypeEntity.getSupplementOrderType().equals("")) {
if (StrUtil.isEmpty(bussinessTypeEntity.getSupplementOrderType())) {
BussinessTypeEntity temp = bussinessTypeDao.selectByAction(bussinessTypeEntity.getAction());
BussinessTypeEntity bussinessTypeEntity1 = bussinessTypeDao.selectByAction(temp.getSupplementOrderType());
if(bussinessTypeEntity1!=null){
if (bussinessTypeEntity1 != null) {
bussinessTypeEntity1.setSupplementOrderType("");
bussinessTypeDao.updateBussinessType(bussinessTypeEntity1);
}

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

@ -1,5 +1,6 @@
package com.glxp.sale.admin.thread;
import cn.hutool.core.util.StrUtil;
import com.glxp.sale.admin.config.WebSocketServer;
import com.glxp.sale.admin.constant.Constant;
import com.glxp.sale.admin.constant.ConstantStatus;
@ -265,6 +266,7 @@ public class IoTransInoutService {
basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
}
// if (!Constant.SYSTEM_CUSTOMER_ID.equals(orderEntity.getFromCorpId())) {
// BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(orderEntity.getFromCorpId());
// if (basicUnitMaintainEntity == null) {
@ -279,22 +281,17 @@ public class IoTransInoutService {
List<WarehouseEntity> filterList = codesTempService.findByOrderId(warehouseQueryRequest);
List<WarehouseEntity> insertList = new ArrayList<>();
orderEntity.setInvStorageCode(orderEntity.getLocStorageCode());
orderService.updateOrder(orderEntity);
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INNOR) {
if (orderEntity.getInvStorageCode() == null) {
if (orderEntity.getInvStorageCode() == null) {
if (!StrUtil.isEmpty(bussinessTypeEntity.getStorageCode())) {
orderEntity.setInvStorageCode(bussinessTypeEntity.getStorageCode());
} else {
orderEntity.setRemark("未选择当前仓库信息");
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_FAIL);
orderService.updateOrder(orderEntity);
}
} else if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
if (orderEntity.getInvStorageCode() == null) {
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findDefault(bussinessTypeEntity.isAdvanceType(), true);
orderEntity.setInvStorageCode(invWarehouseEntity.getCode());
orderService.updateOrder(orderEntity);
return;
}
}
orderService.updateOrder(orderEntity);
for (int j = 0; j < filterList.size(); j++) {
WarehouseEntity warehouseEntity = filterList.get(j);
@ -319,6 +316,14 @@ public class IoTransInoutService {
orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "该产品不允许以使用单元入库！");
return;
}
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findByUdiRlIdUnitFk(udiRelevanceResponse.getId() + "", warehouseEntity.getFromCorpId());
if (companyProductRelevanceEntity == null) {
orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);
orderService.updateRemark(orderEntity.getId(), udiRelevanceResponse.getCpmctymc() + "该产品非此供应商配送");
return;
}
}
}
if (insertList.size() > 0) {
@ -513,33 +518,25 @@ public class IoTransInoutService {
erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
myErpOrderService.updateErpOrder(erpOrderEntity);
orderEntity.setRemark("该产品DI绑定多个产品ID，请在扫码单据详情绑定对应产品ID");
orderEntity.setRemark("该产品维护多个产品信息，请在扫码单据详情绑定对应产品产品信息");
checkStatus = ConstantStatus.ORDER_CHECK_FAIL;
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
orderService.updateOrder(orderEntity);
} else {
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT && (erpOrderEntity.getSupId() == null || erpOrderEntity.getSupId().equals("MUTI"))) {
if (erpOrderEntity.getSupId() == null) {
erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_SUP_NONE);
orderEntity.setRemark("该产品未绑定供应商");
orderEntity.setRemark("该产品未指定供应商");
} else {
erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_SUP_MUTI);
orderEntity.setRemark("该产品绑定多个供应商");
orderEntity.setRemark("该产品指定多个供应商");
}
checkStatus = ConstantStatus.ORDER_CHECK_FAIL;
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
orderService.updateOrder(orderEntity);
} else {
if (bussinessTypeEntity.getCorpType() != ConstantStatus.CORP_TYPE_INNOR) {
CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findByUdiRlIdUnitFk(erpOrderEntity.getBindRlFk(), erpOrderEntity.getSupId());
if (companyProductRelevanceEntity == null) {
orderEntity.setRemark(erpOrderEntity.getCoName() + "该产品非此供应商配送");
checkStatus = ConstantStatus.ORDER_CHECK_FAIL;
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
orderService.updateOrder(orderEntity);
} else {
orderEntity.setContrastStatus(checkStatus);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
@ -561,6 +558,10 @@ public class IoTransInoutService {
}
orderEntity.setContrastStatus(checkStatus);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
orderService.updateOrder(orderEntity);
}
}

31
api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml
Unescape Escape View File

@ -29,10 +29,12 @@
<select id="filterJoin" parameterType="com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest"
resultType="com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity">
SELECT basic_bustype_local.id,basic_bustype_local.name localName, basic_bustype_local.action localAction,originAction,
SELECT basic_bustype_local.id,basic_bustype_local.name localName, basic_bustype_local.action
localAction,originAction,
basic_bussiness_type.name ,
basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable
, basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction
,
basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction
FROM basic_bustype_local inner join
basic_bussiness_type
on basic_bustype_local.action = basic_bussiness_type.localAction
@ -53,7 +55,32 @@
AND spUse =#{spUse}
</if>
</where>
</select>
<select id="filterLeftJoin" parameterType="com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest"
resultType="com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity">
SELECT basic_bustype_local.id,basic_bustype_local.name localName, basic_bustype_local.action
localAction,originAction,
basic_bussiness_type.name ,
basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable,
basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction
FROM basic_bustype_local
LEFT JOIN basic_bussiness_type on basic_bussiness_type.localAction = basic_bustype_local.action
<where>
<if test="name != ''and name != null">
AND basic_bustype_local.name LIKE concat(#{name},'%')
</if>
<if test="action != ''and action != null">
AND basic_bustype_local.action LIKE concat(#{action},'%')
</if>
<if test="enabled != ''and enabled != null">
AND basic_bustype_local.enable =#{enabled}
</if>
<if test="spUse != ''and spUse != null">
AND spUse =#{spUse}
</if>
</where>
</select>

Write Preview
Loading…
Cancel
Save