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 bdb6033325
commit bab023da04
12 changed files with 78 additions and 33 deletions
Show Stats Download Patch File Download Diff File

12
api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessTypeController.java
Unescape Escape View File

@ -25,6 +25,7 @@ import com.glxp.api.admin.res.basic.BussinessTypExportResponse;
import com.glxp.api.admin.res.basic.BussinessTypResponse;
import com.glxp.api.admin.res.basic.SrBtResponse;
import com.glxp.api.admin.service.auth.AuthAdminService;
import com.glxp.api.admin.service.auth.CustomerService;
import com.glxp.api.admin.service.basic.BussinessLocalTypeService;
import com.glxp.api.admin.service.basic.BussinessTypeService;
import com.glxp.api.admin.service.inout.OrderService;
@ -59,11 +60,11 @@ public class BussinessTypeController {
@Resource
private BussinessLocalTypeService bussinessLocalTypeService;
@Resource
private AuthAdminService authAdminService;
@Resource
private BussinessTypeService bussinessTypeService;
@Resource
private OrderService orderService;
@Resource
CustomerService customerService;
@GetMapping("/udiwms/bussinessType/filter")
public BaseResponse filterBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest,
@ -133,6 +134,7 @@ public class BussinessTypeController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<BussinessTypeEntity> bussinessTypeEntities;
bussinessTypeFilterRequest.setUserId(customerService.getUserId());
bussinessTypeEntities = bussinessTypeService.filterAllByUser(bussinessTypeFilterRequest);
PageInfo<BussinessTypeEntity> pageInfo;
pageInfo = new PageInfo<>(bussinessTypeEntities);
@ -188,9 +190,9 @@ public class BussinessTypeController {
}
if (bussinessTypeEntity.getLocalAction() != null && !"".equals(bussinessTypeEntity.getLocalAction())) {
return ResultVOUtils.error(500, "该扫码单据类型已绑定业务单据类型，无法删除！");
}
// if (bussinessTypeEntity.getLocalAction() != null && !"".equals(bussinessTypeEntity.getLocalAction())) {
// return ResultVOUtils.error(500, "该扫码单据类型已绑定业务单据类型，无法删除！");
// }
bussinessTypeService.deleteById(id);

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

@ -15,6 +15,7 @@ import com.glxp.api.admin.entity.inout.*;
import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity;
import com.glxp.api.admin.entity.thrsys.ThrOrderEntity;
import com.glxp.api.admin.httpclient.ErpOrderClient;
import com.glxp.api.admin.req.basic.BusOriginJoinFilterRequest;
import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest;
import com.glxp.api.admin.req.business.StockOrderFilterRequest;
import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest;
@ -117,8 +118,8 @@ public class OrderDetailController {
for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
ErpOrderResponse.SubErpOrder subErpOrder = new ErpOrderResponse.SubErpOrder();
BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder);
subErpOrder.setCount(thrOrderDetailEntity.getCount() + "");
subErpOrder.setReCount(thrOrderDetailEntity.getReCount() + "");
subErpOrder.setCount(thrOrderDetailEntity.getCount());
subErpOrder.setReCount(thrOrderDetailEntity.getReCount());
subErpOrders.add(subErpOrder);
}
}
@ -144,10 +145,15 @@ public class OrderDetailController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessLocalTypeService.findOriginJoinByAction(filterErpOrderRequest.getBillAction());
BussinessOriginTypeResponse bussinessOriginTypeResponse = null;
BusOriginJoinFilterRequest busOriginJoinFilterRequest = new BusOriginJoinFilterRequest();
BeanUtils.copyProperties(filterErpOrderRequest, busOriginJoinFilterRequest);
if (filterErpOrderRequest.getBillAction() != null) {
busOriginJoinFilterRequest.setAction(filterErpOrderRequest.getBillAction());
}
bussinessOriginTypeResponse = bussinessTypeService.findOriginJoinByAction(busOriginJoinFilterRequest);
if (bussinessOriginTypeResponse.getThirdSys() != null) {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessLocalTypeService.findByActionKey(filterErpOrderRequest.getBillAction(), "orderQueryUrl");
BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessLocalTypeService.findByActionKey(bussinessOriginTypeResponse.getLocalAction(), "orderQueryUrl");
if (basicThirdSysDetailEntity == null || !basicThirdSysDetailEntity.getEnabled()) {
return ResultVOUtils.error(500, "第三方业务单据服务未启用");
}
@ -533,9 +539,9 @@ public class OrderDetailController {
erpOrderEntity.setExpireDate(subPurchase.getExpireDate());
erpOrderEntity.setBatchNo(subPurchase.getBatchNo());
if (subPurchase.getCount() != null)
erpOrderEntity.setErpCount(Math.abs(Integer.parseInt(subPurchase.getCount())));
erpOrderEntity.setErpCount(Math.abs(subPurchase.getCount()));
if (subPurchase.getReCount() != null)
erpOrderEntity.setReCount(Math.abs(Integer.parseInt(subPurchase.getReCount())));
erpOrderEntity.setReCount(Math.abs(subPurchase.getReCount()));
erpOrderEntity.setGoodsunit(subPurchase.getSpec());
erpOrderEntities.add(erpOrderEntity);
}
@ -552,7 +558,7 @@ public class OrderDetailController {
OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
orderFilterRequest.setId(importErpOrderRequest.getOrderId());
OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
BussinessOriginTypeResponse bussinessTypeEntity = bussinessTypeService.findOriginJoinByAction(orderEntity.getAction());
ErpOrderEntity exitErp = new ContrastErpUtil().vailErpExit(myErpOrderService, erpOrderEntities, importErpOrderRequest.getOrderId());
if (exitErp != null) {
String errMsg = "所选ERP单" + exitErp.getErpOrderId() + "已被其他出入库单" + exitErp.getOrderIdFk() + "绑定";

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

@ -12,6 +12,7 @@ import com.glxp.api.admin.entity.inout.ErpOrderEntity;
import com.glxp.api.admin.entity.inout.FilterErpOrderRequest;
import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.api.admin.req.inout.OrderFilterRequest;
import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse;
import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysService;
import com.glxp.api.admin.service.basic.CustomService;
@ -275,7 +276,7 @@ public class ContrastErpUtil {
}
//把第三方单据加工转换，新增属性
public List<ErpOrderEntity> transErp(List<ErpOrderEntity> erpOrderEntities, UdiRelevanceService udiRelevanceService, String orderFk, BussinessTypeEntity bussinessTypeEntity) {
public List<ErpOrderEntity> transErp(List<ErpOrderEntity> erpOrderEntities, UdiRelevanceService udiRelevanceService, String orderFk, BussinessOriginTypeResponse bussinessTypeEntity) {
List<ErpOrderEntity> returnOrders = new ArrayList<>();
Map<String, ErpOrderEntity> filterMap = new HashMap<>();
if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
@ -284,13 +285,15 @@ public class ContrastErpUtil {
if (erpOrderEntity.getRelIdFk() != null) {
udiRelevanceResponse = udiRelevanceService.selectGroupById(erpOrderEntity.getRelIdFk());
} else {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(erpOrderEntity.getGoodsid(), bussinessTypeEntity.getThirdSys());
if (udiRelevanceEntity != null) {
udiRelevanceResponse = udiRelevanceService.selectGroupById(udiRelevanceEntity.getId());
erpOrderEntity.setRelIdFk(udiRelevanceEntity.getId());
if (bussinessTypeEntity.getThirdSys() != null) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(erpOrderEntity.getGoodsid(), bussinessTypeEntity.getThirdSys());
if (udiRelevanceEntity != null) {
udiRelevanceResponse = udiRelevanceService.selectGroupById(udiRelevanceEntity.getId());
erpOrderEntity.setRelIdFk(udiRelevanceEntity.getId());
}
}
}
if (udiRelevanceResponse != null) {
erpOrderEntity.setNameCode(udiRelevanceResponse.getNameCode());

4
api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java
Unescape Escape View File

@ -97,8 +97,8 @@ public class ErpOrderClient {
erpOrderEntity.setBatchNo(subPurchase.getBatchNo());
erpOrderEntity.setProductDate(subPurchase.getProductDate());
erpOrderEntity.setExpireDate(subPurchase.getExpireDate());
erpOrderEntity.setErpCount(Math.abs(Integer.parseInt(subPurchase.getCount())));
erpOrderEntity.setReCount(Math.abs(Integer.parseInt(subPurchase.getReCount())));
erpOrderEntity.setErpCount(subPurchase.getCount());
erpOrderEntity.setReCount(subPurchase.getReCount());
erpOrderEntity.setOriginType(erpOrderResponse.getOriginType());
erpOrderEntity.setGoodsunit(subPurchase.getSpec());
erpOrderEntity.setOrderFromType(ConstantStatus.SORDER_FROM_ONLINE);

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

@ -15,6 +15,8 @@ public class FilterOrderRequest {
private Boolean isDownThrSys;
private String corpName;
private Boolean isLocal;
private String action;
private String localAction;
private String thirdAction;
private String thirdOrderFk;
}

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

@ -22,4 +22,6 @@ public class BussinessTypeFilterRequest extends ListPageRequest {
private Boolean secCheckEnable;
private String filterAction;
private Integer userId;
}

1
api-admin/src/main/java/com/glxp/api/admin/res/auth/LoginUserInfoResponse.java
Unescape Escape View File

@ -13,6 +13,7 @@ public class LoginUserInfoResponse {
private Long id;
private String userName;
private String avatar;
private String employeeName;
// 权限列表
private List<String> authRules;
}

12
api-admin/src/main/java/com/glxp/api/admin/res/inout/ErpOrderResponse.java
Unescape Escape View File

@ -93,8 +93,8 @@ public class ErpOrderResponse {
private String batchNo;
private String expireDate;
private String productDate;
private String count; //账面数量
private String reCount; //实际数量
private Integer count; //账面数量
private Integer reCount; //实际数量
private String sweepCount;
private String relId; //基础信息关联表主键
@ -146,19 +146,19 @@ public class ErpOrderResponse {
this.productDate = productDate;
}
public String getCount() {
public Integer getCount() {
return count;
}
public void setCount(String count) {
public void setCount(Integer count) {
this.count = count;
}
public String getReCount() {
public Integer getReCount() {
return reCount;
}
public void setReCount(String reCount) {
public void setReCount(Integer reCount) {
this.reCount = reCount;
}

6
api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java
Unescape Escape View File

@ -3,7 +3,9 @@ package com.glxp.api.admin.service.basic;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity;
import com.glxp.api.admin.req.basic.BusOriginJoinFilterRequest;
import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest;
import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse;
import com.glxp.api.admin.res.basic.BussinessTypResponse;
import java.util.List;
@ -21,6 +23,10 @@ public interface BussinessTypeService {
BussinessTypResponse findJoinBTByAction(String action);
BussinessOriginTypeResponse findOriginJoinByAction(String action);
BussinessOriginTypeResponse findOriginJoinByAction(BusOriginJoinFilterRequest busOriginJoinFilterRequest);
BasicThirdSysDetailEntity findByActionKey(String action, String key);
boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity);

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

@ -98,6 +98,28 @@ public class BussinessTypeServiceImpl implements BussinessTypeService {
return null;
}
@Override
public BussinessOriginTypeResponse findOriginJoinByAction(String action) {
BusOriginJoinFilterRequest busOriginJoinFilterRequest = new BusOriginJoinFilterRequest();
busOriginJoinFilterRequest.setAction(action);
List<BussinessOriginTypeResponse> bussinessOriginTypeResponses = bussinessLocalTypeDao.filterJoinOrigin(busOriginJoinFilterRequest);
if (!bussinessOriginTypeResponses.isEmpty()) {
BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessOriginTypeResponses.get(0);
return bussinessOriginTypeResponse;
}
return null;
}
@Override
public BussinessOriginTypeResponse findOriginJoinByAction(BusOriginJoinFilterRequest busOriginJoinFilterRequest) {
List<BussinessOriginTypeResponse> bussinessOriginTypeResponses = bussinessLocalTypeDao.filterJoinOrigin(busOriginJoinFilterRequest);
if (!bussinessOriginTypeResponses.isEmpty()) {
BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessOriginTypeResponses.get(0);
return bussinessOriginTypeResponse;
}
return null;
}
@Override
public BasicThirdSysDetailEntity findByActionKey(String action, String key) {
BusOriginJoinFilterRequest busOriginJoinFilterRequest = new BusOriginJoinFilterRequest();

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

@ -26,6 +26,7 @@ import com.glxp.api.admin.req.inout.OrderFilterRequest;
import com.glxp.api.admin.req.inout.PostOrderRequest;
import com.glxp.api.admin.req.inout.WarehouseQueryRequest;
import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest;
import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse;
import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
import com.glxp.api.admin.service.basic.BasicUnitMaintainService;
import com.glxp.api.admin.service.basic.BussinessTypeService;
@ -736,7 +737,7 @@ public class IoTransInoutService {
}
public void checkThirdOrder(List<ErpOrderEntity> cloudErps, OrderEntity orderEntity, List<WarehouseEntity> transData) {
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
BussinessOriginTypeResponse bussinessTypeEntity = bussinessTypeService.findOriginJoinByAction(orderEntity.getAction());
if (cloudErps != null && cloudErps.size() > 0) {
//获取需要校验的的第三方单据
List<ErpOrderEntity> returnOrders = contrastErpUtil.transErp(cloudErps, udiRelevanceService, orderEntity.getId(), bussinessTypeEntity);

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

@ -119,6 +119,9 @@
<if test="spUse != ''and spUse != null">
AND basic_bustype_local.spUse =#{spUse}
</if>
<if test="userId != ''and userId != null">
AND inv_warehouse_user.userId =#{userId}
</if>
</where>
group by basic_bussiness_type.action
</select>
@ -131,7 +134,7 @@
,checkEnable,genUnit,innerOrder,secCheckEnable,
checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange
,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,
secCheckChange,checkSp,secCheckSp,thirdAction,storageCode,corpType,advanceType,supplementOrderType)
secCheckChange,checkSp,secCheckSp,storageCode,corpType,advanceType,supplementOrderType)
values
(
#{index},
@ -160,7 +163,6 @@
#{secCheckChange},
#{checkSp},
#{secCheckSp},
#{thirdAction},
#{storageCode},
#{corpType},
#{advanceType},
@ -177,7 +179,7 @@
,checkEnable,genUnit,innerOrder,secCheckEnable,
checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange
,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,
secCheckChange,checkSp,secCheckSp,thirdAction,storageCode,corpType
secCheckChange,checkSp,secCheckSp,storageCode,corpType
,advanceType,supplementOrderType)
values
(
@ -207,7 +209,6 @@
#{secCheckChange},
#{checkSp},
#{secCheckSp},
#{thirdAction},
#{storageCode},
#{corpType},
#{advanceType},
@ -244,7 +245,6 @@
<if test="checkSp != null">checkSp=#{checkSp},</if>
<if test="secCheckSp != null">secCheckSp=#{secCheckSp},</if>
<if test="index != null">index=#{index},</if>
<if test="thirdAction != null">thirdAction=#{thirdAction},</if>
<if test="storageCode != null">storageCode=#{storageCode},</if>
<if test="corpType != null">corpType=#{corpType},</if>
<if test="advanceType != null">advanceType=#{advanceType},</if>

Write Preview
Loading…
Cancel
Save