From b772499867b7b9073235ec0239c4e70df18d8aa9 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 1 Mar 2023 19:37:59 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E6=8F=90=E4=BA=A4=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoOrderController.java | 38 +++- .../com/glxp/api/dao/inout/IoOrderDao.java | 17 ++ .../dao/system/SyncUploadDataBustypeDao.java | 8 +- .../glxp/api/entity/inout/IoOrderEntity.java | 6 + .../entity/thrsys/ThrSystemBusApiEntity.java | 7 +- .../req/inout/FilterUploadOrderRequest.java | 49 +++++ .../req/thrsys/UdiwmsOrderDetailRequest.java | 171 ++++++++++++++++++ .../api/req/thrsys/UdiwmsOrderRequest.java | 65 +++++++ .../glxp/api/res/inout/IoOrderResponse.java | 6 +- .../api/service/inout/IoOrderService.java | 16 ++ .../inout/impl/IoOrderServiceImpl.java | 109 ++++++++++- .../inv/impl/InvCountOrderServiceImpl.java | 4 + .../system/SyncUploadDataBustypeService.java | 7 + .../SyncUploadDataBustypeServiceImpl.java | 12 +- .../thrsys/impl/ThrSystemServiceImpl.java | 2 +- .../mybatis/mapper/inout/IoOrderDao.xml | 50 +++++ .../mapper/inout/IoOrderDetailResultDao.xml | 37 ++-- .../system/SyncUploadDataBustypeDao.xml | 4 +- 18 files changed, 568 insertions(+), 40 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/inout/FilterUploadOrderRequest.java create mode 100644 src/main/java/com/glxp/api/req/thrsys/UdiwmsOrderDetailRequest.java create mode 100644 src/main/java/com/glxp/api/req/thrsys/UdiwmsOrderRequest.java diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index d73e17b11..623e32407 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -15,10 +15,7 @@ import com.glxp.api.entity.basic.EntrustReceEntity; import com.glxp.api.entity.inout.*; import com.glxp.api.req.auth.FilterInvBusUserRequest; import com.glxp.api.req.basic.BasicEntrustRecRequest; -import com.glxp.api.req.inout.AddOrderRequest; -import com.glxp.api.req.inout.FilterOrderDetailBizRequest; -import com.glxp.api.req.inout.FilterOrderRequest; -import com.glxp.api.req.inout.OrderEditRequest; +import com.glxp.api.req.inout.*; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.inout.IoOrderDetailBizResponse; @@ -31,14 +28,10 @@ import com.glxp.api.service.inout.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.ArrayList; -import java.util.Date; import java.util.List; @@ -419,4 +412,31 @@ public class IoOrderController extends BaseController { return ResultVOUtils.success(); } + /** + * 查询上传单据 + * + * @param uploadOrderRequest + * @return + */ + @GetMapping("/udiwms/inout/order/upload/filter") + public BaseResponse filterUploadOrder(FilterUploadOrderRequest uploadOrderRequest) { + List list = orderService.filterUploadOrderList(uploadOrderRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + + /** + * 上传单据到第三方系统 + * + * @param billNo + * @return + */ + @GetMapping("/udiwms/inout/order/submitToThrSys") + public BaseResponse submitToThrSys(@RequestParam("billNo") String billNo) { + if (StrUtil.isBlank(billNo)) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + return orderService.submitToThrSys(billNo); + } + } diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java index a3521bb1c..46a59feb3 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java @@ -3,6 +3,7 @@ package com.glxp.api.dao.inout; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.req.inout.FilterUploadOrderRequest; import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inout.OrderNoResult; import org.apache.ibatis.annotations.Param; @@ -42,4 +43,20 @@ public interface IoOrderDao extends BaseMapperPlus selectUploadOrder(FilterUploadOrderRequest uploadOrderRequest); + + /** + * 查询单据的类型 + * + * @param billNo + * @return + */ + String selectActionByBillNo(@Param("billNo") String billNo); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/system/SyncUploadDataBustypeDao.java b/src/main/java/com/glxp/api/dao/system/SyncUploadDataBustypeDao.java index 667b492f2..03120a022 100644 --- a/src/main/java/com/glxp/api/dao/system/SyncUploadDataBustypeDao.java +++ b/src/main/java/com/glxp/api/dao/system/SyncUploadDataBustypeDao.java @@ -15,5 +15,11 @@ public interface SyncUploadDataBustypeDao { void inserts(@Param("syncDataBustypeEntities") List syncDataBustypeEntities); - + /** + * 查询配置的单据类型数量 + * + * @param action + * @return + */ + int selectCountByAction(@Param("action") String action); } diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java index 32e598d7c..3835b7222 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java @@ -11,6 +11,7 @@ import java.util.Date; @Data @TableName(value = "io_order") public class IoOrderEntity { + @TableId(value = "id", type = IdType.AUTO) private Integer id; @@ -206,5 +207,10 @@ public class IoOrderEntity { @TableField(value = "fromThrBillNo") private String fromThrBillNo; + /** + * 导出状态/上传状态（0.未导出，1.已导出，2.导出失败） + */ + @TableField(value = "exportStatus") + private Integer exportStatus; } diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrSystemBusApiEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrSystemBusApiEntity.java index f368eefec..17d57f990 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrSystemBusApiEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrSystemBusApiEntity.java @@ -4,14 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serializable; - import lombok.Data; @Data @TableName(value = "thr_system_bus_api") -public class ThrSystemBusApiEntity implements Serializable { +public class ThrSystemBusApiEntity { @TableId(value = "id", type = IdType.AUTO) private Integer id; @@ -34,7 +31,7 @@ public class ThrSystemBusApiEntity implements Serializable { private String url; @TableField(value = "`type`") - private Byte type; + private Integer type; @TableField(value = "remark") private String remark; diff --git a/src/main/java/com/glxp/api/req/inout/FilterUploadOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterUploadOrderRequest.java new file mode 100644 index 000000000..53e59dcdb --- /dev/null +++ b/src/main/java/com/glxp/api/req/inout/FilterUploadOrderRequest.java @@ -0,0 +1,49 @@ +package com.glxp.api.req.inout; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.List; + +/** + * 查询上传单据列表参数 + */ +@Data +public class FilterUploadOrderRequest extends ListPageRequest { + + /** + * 单据号 + */ + private String billNo; + + /** + * 单据类型 + */ + private String billType; + + /** + * 单据类型列表集合 + */ + private List billTypes; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 单据时间范围，开始时间 + */ + private String startTime; + + /** + * 单据时间范围，结束时间 + */ + private String endTime; + + /** + * 提交状态 + */ + private String submitStatus; + +} diff --git a/src/main/java/com/glxp/api/req/thrsys/UdiwmsOrderDetailRequest.java b/src/main/java/com/glxp/api/req/thrsys/UdiwmsOrderDetailRequest.java new file mode 100644 index 000000000..bdcebc30a --- /dev/null +++ b/src/main/java/com/glxp/api/req/thrsys/UdiwmsOrderDetailRequest.java @@ -0,0 +1,171 @@ +package com.glxp.api.req.thrsys; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 单据详情参数 + */ +@Data +public class UdiwmsOrderDetailRequest { + + /** + * 产品编码 + */ + private String productId; + + /** + * 产品名称 + */ + private String productName; + + /** + * 单价 + */ + private BigDecimal price; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 生产日期 + */ + private String productDate; + + /** + * 规格型号 + */ + private String standard; + + /** + * 单据号 + */ + private String billNo; + + /** + * 销售发票号（第二票） + */ + private String secSalesInvNo; + + /** + * 发票日期 + */ + private String invoiceDate; + + /** + * 第二票销售清单号 + */ + private String secSalesListNo; + + /** + * 销售发票号（第一票） + */ + private String firstSalesInvNo; + + /** + * 注册/备案证号 + */ + private String registerNo; + + /** + * 生产厂家 + */ + private String manufactory; + + /** + * 计量单位 + */ + private String measname; + + /** + * 数量 + */ + private Integer count; + + /** + * 备注 + */ + private String remark; + + /** + * 备注1/规格型号ID + */ + private String remark1; + + /** + * 备注2/型号 + */ + private String remark2; + + /** + * 备注3/规格 + */ + private String remark3; + + /** + * 是否允许无批次号 + */ + private boolean allowNoBatch; + + /** + * 序列号 + */ + private String serialNo; + + private List codeList; + + /** + * 码明细参数 + */ + public static class CodeDetailEntity { + + /** + * UDI码 + */ + private String code; + + /** + * DI + */ + private String nameCode; + + /** + * 数量 + */ + private Integer count; + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getNameCode() { + return nameCode; + } + + public void setNameCode(String nameCode) { + this.nameCode = nameCode; + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + } + +} diff --git a/src/main/java/com/glxp/api/req/thrsys/UdiwmsOrderRequest.java b/src/main/java/com/glxp/api/req/thrsys/UdiwmsOrderRequest.java new file mode 100644 index 000000000..70e151214 --- /dev/null +++ b/src/main/java/com/glxp/api/req/thrsys/UdiwmsOrderRequest.java @@ -0,0 +1,65 @@ +package com.glxp.api.req.thrsys; + +import lombok.Data; + +import java.util.List; + +@Data +public class UdiwmsOrderRequest { + + /** + * 单据号 + */ + private String billNo; + + /** + * 单据日期 + */ + private String billDate; + + /** + * 往来单位ID + */ + private String corpId; + + /** + * 单据状态,0.未签字，1.已签字 + */ + private String billFlag; + + /** + * 出入库类型：1:入库，2:出库 + */ + private Integer inoutType; + + /** + * 单据类型/业务类型 + */ + private String billType; + + /** + * 往来单位 + */ + private String corpName; + + /** + * 仓库编码 + */ + private String locInvCode; + + /** + * 仓库名称 + */ + private String locInvName; + + /** + * 备注 + */ + private String remark; + + /** + * 单据详情数组 + */ + private List item; + +} diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 27301cfec..ac7c8cdf8 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -1,7 +1,6 @@ package com.glxp.api.res.inout; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.Date; @@ -212,6 +211,11 @@ public class IoOrderResponse { private String customerName; + /** + * 导出状态/上传状态（0.未导出，1.已导出，2.导出失败） + */ + private Integer exportStatus; + public String getFromName() { diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java index f89ec669b..51a244f04 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java @@ -1,7 +1,9 @@ package com.glxp.api.service.inout; +import com.glxp.api.common.res.BaseResponse; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.req.inout.FilterUploadOrderRequest; import com.glxp.api.req.inout.OrderEditRequest; import com.glxp.api.res.inout.IoOrderResponse; @@ -95,5 +97,19 @@ public interface IoOrderService { */ void updateOrderInfo(OrderEditRequest orderEditRequest); + /** + * 查询上传单据列表 + * + * @param uploadOrderRequest + * @return + */ + List filterUploadOrderList(FilterUploadOrderRequest uploadOrderRequest); + /** + * 上传单据到第三方系统 + * + * @param billNo + * @return + */ + BaseResponse submitToThrSys(String billNo); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 78b38aa3b..1d421037b 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -5,26 +5,37 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.auth.DeptDao; import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.basic.BasicBussinessTypeDao; -import com.glxp.api.dao.basic.BasicCorpDao; import com.glxp.api.dao.inout.IoOrderDao; +import com.glxp.api.dao.thrsys.ThrSystemBusApiDao; +import com.glxp.api.dao.thrsys.ThrSystemDao; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.inv.*; +import com.glxp.api.entity.system.SyncDataBustypeEntity; +import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; +import com.glxp.api.entity.thrsys.ThrSystemEntity; +import com.glxp.api.http.HttpOkClient; import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.req.inout.FilterUploadOrderRequest; import com.glxp.api.req.inout.OrderEditRequest; +import com.glxp.api.req.thrsys.UdiwmsOrderRequest; import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inout.OrderNoResult; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.*; import com.glxp.api.service.inv.*; +import com.glxp.api.service.system.SyncUploadDataBustypeService; import com.glxp.api.util.DateUtil; import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.extern.slf4j.Slf4j; @@ -34,6 +45,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.lang.reflect.Field; import java.util.*; +import java.util.stream.Collectors; @Slf4j @Service @@ -44,8 +56,6 @@ public class IoOrderServiceImpl implements IoOrderService { @Resource private BasicBussinessTypeDao basicBussinessTypeDao; @Resource - private BasicCorpDao basicCorpDao; - @Resource private DeptDao deptDao; @Resource private InvWarehouseDao invWarehouseDao; @@ -73,6 +83,14 @@ public class IoOrderServiceImpl implements IoOrderService { IoOrderDetailCodeService ioOrderDetailCodeService; @Resource IoOrderDetailResultService ioOrderDetailResultService; + @Resource + private SyncUploadDataBustypeService syncUploadDataBustypeService; + @Resource + private ThrSystemBusApiDao thrSystemBusApiDao; + @Resource + private ThrSystemDao thrSystemDao; + @Resource + private HttpOkClient httpOkClient; @Override public List selectAll() { @@ -116,6 +134,7 @@ public class IoOrderServiceImpl implements IoOrderService { @Override public int insertOrder(IoOrderEntity orderEntity) { orderEntity.setId(null); + orderEntity.setExportStatus(0); //上传状态：未上传 return orderDao.insert(orderEntity); } @@ -124,6 +143,7 @@ public class IoOrderServiceImpl implements IoOrderService { public int insertOrUpdate(IoOrderEntity orderEntity) { IoOrderEntity temp = orderDao.selectOne(new QueryWrapper().eq("billNo", orderEntity.getBillNo())); if (temp == null) { + orderEntity.setExportStatus(0); //上传状态：未上传 return orderDao.insert(orderEntity); } else { return orderDao.updateById(orderEntity); @@ -443,7 +463,7 @@ public class IoOrderServiceImpl implements IoOrderService { result.add(response); } catch (Exception e) { e.printStackTrace(); - log.error(orderEntity.getBillNo() + "平衡补单出错\n" ); + log.error(orderEntity.getBillNo() + "平衡补单出错\n"); } }); @@ -544,6 +564,87 @@ public class IoOrderServiceImpl implements IoOrderService { orderDao.update(order, new QueryWrapper().in("billNo", orderEditRequest.getOrderIds())); } + @Override + public List filterUploadOrderList(FilterUploadOrderRequest uploadOrderRequest) { + if (null == uploadOrderRequest) { + return Collections.emptyList(); + } + //判断是否查询指定的单据类型，如果没指定则查询配置的所有可以上传的类型 + if (StrUtil.isBlank(uploadOrderRequest.getBillType())) { + List busTypes = syncUploadDataBustypeService.findAll(); + if (CollUtil.isNotEmpty(busTypes)) { + Iterator iterator = busTypes.iterator(); + while (iterator.hasNext()) { + Long count = thrSystemBusApiDao.selectCount(new QueryWrapper() + .eq("code", iterator.next().getAction())); + if (count == 0) { + //单据类型不在上传单据类型列表中配置 + iterator.remove(); + } + } + if (CollUtil.isNotEmpty(busTypes)) { + List busCodes = busTypes.stream().map(SyncDataBustypeEntity::getAction).collect(Collectors.toList()); + uploadOrderRequest.setBillTypes(busCodes); + } else { + log.info("未在接口设置中配置，无可以上传的单据数据"); + return Collections.emptyList(); + } + } else { + log.info("上传设置中未配置可以上传的单据类型"); + return Collections.emptyList(); + } + } else { + //查询此单据类型在上传第三方系统单据类型中是否有配置，若未配置则查询无数据 + boolean exists = syncUploadDataBustypeService.findExists(uploadOrderRequest.getBillType()); + if (exists) { + //查询此单据类型有无关联 + Long count = thrSystemBusApiDao.selectCount(new QueryWrapper() + .eq("code", uploadOrderRequest.getBillType())); + if (count == 0) { + log.info("未在接口设置中配置，无可以上传的单据数据"); + return Collections.emptyList(); + } + } else { + log.info("查询的单据类型未在单据上传设置中配置"); + return Collections.emptyList(); + } + } + + if (null != uploadOrderRequest.getPage() && null != uploadOrderRequest.getLimit()) { + PageHelper.offsetPage((uploadOrderRequest.getPage() - 1) * uploadOrderRequest.getLimit(), uploadOrderRequest.getLimit()); + } + return orderDao.selectUploadOrder(uploadOrderRequest); + } + + @Override + public BaseResponse submitToThrSys(String billNo) { + //查询单据类型 + String billType = orderDao.selectActionByBillNo(billNo); + + //查询此单据类型对应的第三方系统ID + ThrSystemBusApiEntity thrSystemBusApiEntity = thrSystemBusApiDao.selectByCode(billType); + //查询第三方系统 + ThrSystemEntity thrSystemEntity = thrSystemDao.selectByThirdId(thrSystemBusApiEntity.getThirdSys()); + if (null == thrSystemEntity || StrUtil.isBlank(thrSystemEntity.getThridUrl())) { + return ResultVOUtils.error(500, "提交失败，未配置第三方服务IP地址"); + } + UdiwmsOrderRequest udiwmsOrderRequest = new UdiwmsOrderRequest(); + udiwmsOrderRequest.setBillNo(billNo); + udiwmsOrderRequest.setBillType(billType); + String response = httpOkClient.uCloudPost(thrSystemEntity.getThridUrl() + "/udiwms/erp/submitOrders", udiwmsOrderRequest); + if (StrUtil.isBlank(response)) { + log.info("单据提交失败，无返回信息"); + return ResultVOUtils.error(500, "提交失败"); + } else { + BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); + if (baseResponse.getCode() == 20000) { + return ResultVOUtils.success("提交成功"); + } else { + log.error("单据提交失败，错误信息：{}", baseResponse.getMessage()); + return ResultVOUtils.error(500, "提交失败"); + } + } + } /** * 查询此单据关联的所有单据 diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java index ff92468c9..a94e29a5e 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java @@ -335,6 +335,10 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { //设置为草稿状态 order.setStatus(1); order.setDealStatus(1); + + //设置上传状态为未上传 + order.setExportStatus(0); + //生成单据号 String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trim(inBusType.getPrefix()), "yyyyMMdd")); order.setBillNo(orderNo); diff --git a/src/main/java/com/glxp/api/service/system/SyncUploadDataBustypeService.java b/src/main/java/com/glxp/api/service/system/SyncUploadDataBustypeService.java index 2c9aa7d84..09c0f9b9b 100644 --- a/src/main/java/com/glxp/api/service/system/SyncUploadDataBustypeService.java +++ b/src/main/java/com/glxp/api/service/system/SyncUploadDataBustypeService.java @@ -12,4 +12,11 @@ public interface SyncUploadDataBustypeService { void inserts(List syncDataBustypeEntities); + /** + * 查询单据类型是否配置在上传设置的单据类型列表里 + * + * @param action + * @return + */ + boolean findExists(String action); } diff --git a/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataBustypeServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataBustypeServiceImpl.java index 5105744c2..1c08b6d66 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataBustypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataBustypeServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.system.impl; +import cn.hutool.core.util.StrUtil; import com.glxp.api.dao.system.SyncUploadDataBustypeDao; import com.glxp.api.entity.system.SyncDataBustypeEntity; import com.glxp.api.service.system.SyncUploadDataBustypeService; @@ -12,7 +13,7 @@ import java.util.List; public class SyncUploadDataBustypeServiceImpl implements SyncUploadDataBustypeService { @Resource - SyncUploadDataBustypeDao syncUploadDataBustypeDao; + private SyncUploadDataBustypeDao syncUploadDataBustypeDao; @Override public List findAll() { @@ -28,4 +29,13 @@ public class SyncUploadDataBustypeServiceImpl implements SyncUploadDataBustypeSe public void inserts(List syncDataBustypeEntities) { syncUploadDataBustypeDao.inserts(syncDataBustypeEntities); } + + @Override + public boolean findExists(String action) { + if (StrUtil.isNotBlank(action)) { + int count = syncUploadDataBustypeDao.selectCountByAction(action); + return count > 0; + } + return false; + } } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java index f4b5091bd..399817ae5 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java @@ -20,7 +20,7 @@ import java.util.List; public class ThrSystemServiceImpl implements ThrSystemService { @Resource - ThrSystemDao thrSystemDao; + private ThrSystemDao thrSystemDao; @Resource private AuthLicenseDao authLicenseDao; diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 8e7725bd8..a4d380665 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -143,4 +143,54 @@ from io_order where billNo = #{billNo} + + + + diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index b3e0e13be..3cd59c539 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -1,22 +1,25 @@ - - + select * + from io_order_detail_result + + + AND orderIdFk = #{orderIdFk} + + + AND nameCode = #{nameCode} + + + AND batchNo = #{batchNo} + + + AND coName = #{productName} + + + AND coName like concat('%', #{productName}, '%') + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/system/SyncUploadDataBustypeDao.xml b/src/main/resources/mybatis/mapper/system/SyncUploadDataBustypeDao.xml index bf82cc0bc..4f226adb3 100644 --- a/src/main/resources/mybatis/mapper/system/SyncUploadDataBustypeDao.xml +++ b/src/main/resources/mybatis/mapper/system/SyncUploadDataBustypeDao.xml @@ -29,5 +29,7 @@ - + \ No newline at end of file