修复入账库查询列表不会显示‘计量单位’,生产企业与单据类型的不一致

pro
1178634255 2 years ago
parent 8451e223fe
commit 9f1f491db3

@ -178,8 +178,6 @@ public class BasicBussinessTypeController extends BaseController {
@GetMapping("/udiwms/localBusType/filterJoinByUser") @GetMapping("/udiwms/localBusType/filterJoinByUser")
public BaseResponse filterJoinByUser(FilterBussinessTypeRequest bussinessTypeFilterRequest, public BaseResponse filterJoinByUser(FilterBussinessTypeRequest bussinessTypeFilterRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getVueType())) { if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getVueType())) {
List<BasicBussinessTypeEntity> result = new ArrayList<>(); List<BasicBussinessTypeEntity> result = new ArrayList<>();
List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findByVueType(bussinessTypeFilterRequest.getVueType()); List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findByVueType(bussinessTypeFilterRequest.getVueType());

@ -81,19 +81,15 @@ public class IoOrderController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/udiwms/inout/order/filter") @GetMapping("/udiwms/inout/order/filter")
public BaseResponse filterOrder(FilterOrderRequest filterOrderRequest) { public BaseResponse filterOrder(FilterOrderRequest filterOrderRequest) {
if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) { if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) {
orderService.setFilterStatus(filterOrderRequest); orderService.setFilterStatus(filterOrderRequest);
} }
if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) { if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) {
orderService.setActions(filterOrderRequest); orderService.setActions(filterOrderRequest);
} }
if (StrUtil.isNotEmpty(filterOrderRequest.getSupInoivceSearch())) { if (StrUtil.isNotEmpty(filterOrderRequest.getSupInoivceSearch())) {
orderService.setInvoiceFiltes(filterOrderRequest); orderService.setInvoiceFiltes(filterOrderRequest);
} }
if (filterOrderRequest.getSourceLocalType() != null) { if (filterOrderRequest.getSourceLocalType() != null) {
if (filterOrderRequest.getSourceLocalType() == 1) { if (filterOrderRequest.getSourceLocalType() == 1) {
filterOrderRequest.setSourceTypes(Arrays.asList(1, 2, 3, 4, 5)); filterOrderRequest.setSourceTypes(Arrays.asList(1, 2, 3, 4, 5));

@ -25,6 +25,7 @@ public class InvPlaceOrderController {
public BaseResponse filterList(FilterInvPlaceOrderRequest filterInvPlaceOrderRequest) { public BaseResponse filterList(FilterInvPlaceOrderRequest filterInvPlaceOrderRequest) {
List<InvPlaceOrderResponse> list = invPlaceOrderService.filterList(filterInvPlaceOrderRequest); List<InvPlaceOrderResponse> list = invPlaceOrderService.filterList(filterInvPlaceOrderRequest);
PageInfo<InvPlaceOrderResponse> pageInfo = new PageInfo<>(list); PageInfo<InvPlaceOrderResponse> pageInfo = new PageInfo<>(list);
System.out.println("6666666666666666");
return ResultVOUtils.page(pageInfo); return ResultVOUtils.page(pageInfo);
} }

@ -149,7 +149,6 @@ public class IoPurChangeService {
//插入计划主表 //插入计划主表
purPlanService.insert(purPlanEntity); purPlanService.insert(purPlanEntity);
//用stream流复制list //用stream流复制list
System.out.println("111111111111111111111111111我要进来咯666666666666666++++++++++++++++");
purPlanDetailEntityList = purApplyDetailEntityList.stream().map(e -> { purPlanDetailEntityList = purApplyDetailEntityList.stream().map(e -> {
PurPlanDetailEntity d = new PurPlanDetailEntity(); PurPlanDetailEntity d = new PurPlanDetailEntity();
d.setOrderIdFk(purPlanEntity.getId() + ""); d.setOrderIdFk(purPlanEntity.getId() + "");
@ -158,7 +157,6 @@ public class IoPurChangeService {
d.setCount(e.getCount()); d.setCount(e.getCount());
d.setSupId(e.getSupId()); d.setSupId(e.getSupId());
d.setZczbhhzbapzbh(e.getZczbhhzbapzbh()); d.setZczbhhzbapzbh(e.getZczbhhzbapzbh());
System.out.println("ddddddddddddddddddddddddddddddd"+d);
return d; return d;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
purPlanDetailService.insertPurPlanDetailEntity(purPlanDetailEntityList); purPlanDetailService.insertPurPlanDetailEntity(purPlanDetailEntityList);

@ -113,4 +113,10 @@ public class InvProductResponse {
private String code; private String code;
/*
*
* */
private String measname;
} }

@ -9,6 +9,7 @@
bp.cpmctymc, bp.cpmctymc,
ipp.relId, ipp.relId,
bp.ggxh, bp.ggxh,
bp.measname,
ipp.batchNo, ipp.batchNo,
ipp.produceDate, ipp.produceDate,
ipp.expireDate, ipp.expireDate,

Loading…
Cancel
Save