From 4b4d6beb7ab2bfad9b59391ea050fc676b9e0778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 30 May 2023 11:03:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/ThrBusTypeOriginController.java | 10 +++++----- .../api/controller/thrsys/ThrOrderController.java | 12 ++++++------ .../com/glxp/api/entity/thrsys/ThrOrderEntity.java | 5 +++++ .../com/glxp/api/res/thrsys/ThrOrderResponse.java | 3 ++- .../resources/mybatis/mapper/thrsys/ThrOrderDao.xml | 4 ++-- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java index 815de039c..459771db5 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java @@ -105,11 +105,11 @@ public class ThrBusTypeOriginController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } if (thrBusTypeOriginEntity != null) { - //校验单据类型代码是否重复 -// boolean exists = thrBusTypeOriginService.checkActionExists(thrBusTypeOriginEntity.getAction(), thrBusTypeOriginEntity.getThirdSys()); -// if (exists) { -// return ResultVOUtils.error(500, "单据类型已存在！"); -// } +// 校验单据类型代码是否重复 + boolean exists = thrBusTypeOriginService.checkActionExists(thrBusTypeOriginEntity.getAction(), thrBusTypeOriginEntity.getThirdSys()); + if (exists) { + return ResultVOUtils.error(500, "单据类型已存在！"); + } thrBusTypeOriginService.updateBusOriginType(thrBusTypeOriginEntity); } else { ResultVOUtils.error(999, "参数错误"); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java index 82f1bcf3b..5d3a31890 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java @@ -286,9 +286,9 @@ public class ThrOrderController { return ResultVOUtils.error(500, "当前任务正在下载更新业务单据信息，请稍后重试！"); } else { redisUtil.set(Constant.dlThrOrders, "true", 10 * 30); - if (filterThrProductsRequest.getBillAction() == null) { - return ResultVOUtils.error(500, "未选择业务类型！"); - } +// if (filterThrProductsRequest.getBillAction() == null) { +// return ResultVOUtils.error(500, "未选择业务类型！"); +// } ThrOrderImportLogEntity thrOrderImportLogEntity = new ThrOrderImportLogEntity(); String genKey = CustomUtil.getId(); @@ -356,8 +356,8 @@ public class ThrOrderController { } //只查询第三方单据 - @GetMapping("/udiwms/thirdOrder/filter") - public BaseResponse filterThirdOrder(FilterThrOrderRequest filterErpOrderRequest, + @PostMapping("/udiwms/thirdOrder/filter") + public BaseResponse filterThirdOrder(@RequestBody FilterThrOrderRequest filterErpOrderRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -390,7 +390,7 @@ public class ThrOrderController { if (data != null && data.size() > 0) { for (ThrOrderEntity thrOrderEntity : data) { FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); - filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); + filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getBillNo() + ""); List thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); ThrOrderResponse erpOrderResponse = new ThrOrderResponse(); BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse); diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrOrderEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderEntity.java index f1ccaa789..12c69b069 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderEntity.java @@ -47,6 +47,10 @@ public class ThrOrderEntity { @TableField(value = "billType") private String billType; + @TableField(value = "originType") + private String originType; + + /** * 单据类型名称 */ @@ -161,6 +165,7 @@ public class ThrOrderEntity { @TableField(value = "remark") private String remark; + private static final long serialVersionUID = 1L; public static final String COL_ID = "id"; diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrOrderResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrOrderResponse.java index 6c8bf209f..48da2b62f 100644 --- a/src/main/java/com/glxp/api/res/thrsys/ThrOrderResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrOrderResponse.java @@ -1,5 +1,6 @@ package com.glxp.api.res.thrsys; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.math.BigDecimal; @@ -37,6 +38,7 @@ public class ThrOrderResponse { private String remark3; //备注3 private String invWarehouseName; private String fromSubInvName; + private String billTypeName; public static class SubErpOrder { private Integer id; @@ -56,7 +58,6 @@ public class ThrOrderResponse { private String detailId; //明细ID private String corpName; //往来单位 private BigDecimal price; //单价 - public String getDetailId() { return detailId; } diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml index 6ddd2a8b8..2d4bd7738 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml @@ -6,7 +6,7 @@ resultType="com.glxp.api.entity.thrsys.ThrOrderEntity"> SELECT thr_order.*, thr_bustype_origin.name billTypeName FROM thr_order - left join thr_bustype_origin on thr_order.billType = thr_bustype_origin.action + LEFT JOIN thr_bustype_origin ON thr_order.billType = thr_bustype_origin.action AND billNo = #{billNo} @@ -15,7 +15,7 @@ AND thr_order.id = #{id} - AND billType = #{billAction} + AND thr_bustype_origin.action = #{billAction} AND billFlag = #{billFlag}