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

1.修复预验收单据查询错误问题

Browse Source
busUser
x_z 3 years ago
parent d0741f3348
commit 0531281f4b
5 changed files with 46 additions and 48 deletions
Show Stats Download Patch File Download Diff File

4
api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantType.java
Unescape Escape View File

@ -18,8 +18,8 @@ public interface ConstantType {
String TYPE_CODE_DESTORY = "CodeDestory"; //码注销
String TYPE_STOCK_CHECK = "StockCheck"; //盘点
String TYPE_PUT = "WareHouseIn"; //出库
String TYPE_OUT = "WareHouseOut"; //入库
String TYPE_PUT = "WareHouseIn"; //入库
String TYPE_OUT = "WareHouseOut"; //出库
String TYPE_IN_CONSIGN = "ConsignWareHouseIn"; //寄售入库

54
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
Unescape Escape View File

@ -7,7 +7,6 @@ import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.constant.ConstantType;
import com.glxp.sale.admin.controller.inout.utils.DataTransUtil;
import com.glxp.sale.admin.dao.inout.CodesTempDao;
import com.glxp.sale.admin.dao.inout.OrderDao;
@ -791,44 +790,37 @@ public class OrderController {
if (StrUtil.isEmpty(code) && StrUtil.isEmpty(billNo)) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
List<OrderEntity> orderEntities = new ArrayList<>();
Set<OrderEntity> orderEntities = new HashSet<>();
//查询预验收单据类型
BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
bussinessTypeFilterRequest.setCheckPreIn(true);
List<BussinessTypResponse> bussinessTypResponses = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest);
if (StrUtil.isNotEmpty(code)) {
//查询预验收单据类型
BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
bussinessTypeFilterRequest.setPreIn(true);
bussinessTypeFilterRequest.setMainAction(ConstantType.TYPE_PUT);
List<BussinessTypResponse> bussinessTypResponses = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest);
List<String> actions = new ArrayList<>();
if (CollUtil.isNotEmpty(bussinessTypResponses)) {
for (BussinessTypResponse bussinessTypResponse : bussinessTypResponses) {
actions.add(bussinessTypResponse.getAction());
}
WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
warehouseQueryRequest.setCode(code);
warehouseQueryRequest.setActions(actions);
List<WarehouseEntity> warehouseEntityList = codesService.findAllByOrderId(warehouseQueryRequest);
if (CollUtil.isNotEmpty(warehouseEntityList)) {
for (WarehouseEntity warehouseEntity : warehouseEntityList) {
List<OrderEntity> temps = orderService.filterPreInChange(warehouseEntity.getOrderId());
if (CollUtil.isNotEmpty(temps))
orderEntities.addAll(temps);
List<String> actions = new ArrayList<>();
if (CollUtil.isNotEmpty(bussinessTypResponses)) {
for (BussinessTypResponse bussinessTypResponse : bussinessTypResponses) {
actions.add(bussinessTypResponse.getAction());
}
WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
warehouseQueryRequest.setCode(code);
warehouseQueryRequest.setActions(actions);
List<WarehouseEntity> warehouseEntityList = codesService.findAllByOrderId(warehouseQueryRequest);
if (CollUtil.isNotEmpty(warehouseEntityList)) {
for (WarehouseEntity warehouseEntity : warehouseEntityList) {
List<OrderEntity> temps = orderService.filterPreInChange(warehouseEntity.getOrderId());
if (CollUtil.isNotEmpty(temps))
orderEntities.addAll(temps);
}
}
}
} else {
orderEntities = orderService.filterPreInChange(billNo);
}
PageInfo<OrderEntity> pageInfo = new PageInfo<>(orderEntities);
ArrayList<OrderEntity> result = CollUtil.newArrayList(orderEntities);
PageInfo<OrderEntity> pageInfo = new PageInfo<>(result);
PageSimpleResponse<OrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(orderEntities);
pageSimpleResponse.setList(result);
return ResultVOUtils.success(pageSimpleResponse);
}

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

@ -27,4 +27,6 @@ public class BussinessTypeFilterRequest extends ListPageRequest {
private String ids;
private List<String> actionList;
private Boolean preIn;
private Boolean checkPreIn;
}

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

@ -380,27 +380,28 @@ public class OrderServiceImpl implements OrderService {
orderId = stockOrderEntity.getOrderIdFk();
}
OrderEntity orderEntity = orderDao.selectByBillNo(orderId);
orderEntities.add(orderEntity);
if (StrUtil.isNotEmpty(orderEntity.getPreInBillNo())) {
String[] priInNo = orderEntity.getPreInBillNo().split(";");
if (priInNo != null) {
for (int i = 0; i < priInNo.length; i++) {
OrderEntity temp = orderDao.selectByBillNo(priInNo[i]);
orderEntities.add(temp);
if (null != orderEntity) {
orderEntities.add(orderEntity);
if (StrUtil.isNotBlank(orderEntity.getPreInBillNo())) {
String[] priInNo = orderEntity.getPreInBillNo().split(";");
if (priInNo != null) {
for (int i = 0; i < priInNo.length; i++) {
OrderEntity temp = orderDao.selectByBillNo(priInNo[i]);
orderEntities.add(temp);
}
}
}
}
if (StrUtil.isNotEmpty(orderEntity.getPreOutBillNo())) {
String[] priInNo = orderEntity.getPreOutBillNo().split(";");
if (priInNo != null) {
for (int i = 0; i < priInNo.length; i++) {
OrderEntity temp = orderDao.selectByBillNo(priInNo[i]);
orderEntities.add(temp);
if (StrUtil.isNotEmpty(orderEntity.getPreOutBillNo())) {
String[] priInNo = orderEntity.getPreOutBillNo().split(";");
if (priInNo != null) {
for (int i = 0; i < priInNo.length; i++) {
OrderEntity temp = orderDao.selectByBillNo(priInNo[i]);
orderEntities.add(temp);
}
}
}
}
return orderEntities;
}

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

@ -115,6 +115,9 @@
<if test="secCheckEnable != ''and secCheckEnable != null">
AND basic_bussiness_type.secCheckEnable =#{secCheckEnable}
</if>
<if test="checkPreIn != null">
AND (basic_bussiness_type.scanPreIn = true or basic_bustype_local.preIn = true)
</if>
<if test="actionList != null and actionList.size() >0">
<foreach collection="actionList" item="action" open="AND (" separator="AND" close=")">
basic_bussiness_type.action &lt;&gt; #{action,jdbcType=VARCHAR}

Write Preview
Loading…
Cancel
Save