From 05aaaee79721ee149243689116d7fd4feb568574 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 30 Jan 2023 17:40:58 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E8=A1=A5=E5=8D=95=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=AD=97=E6=AE=B5=202.?= =?UTF-8?q?=E8=A1=A5=E5=85=A8=E8=A1=A5=E5=8D=95=E8=AE=BE=E7=BD=AE=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=8E=A5=E5=8F=A3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicBusTypePreController.java | 46 ++++++++++++++----- .../api/dao/basic/BasicBusTypePreDao.java | 7 +++ .../entity/basic/BasicBusTypePreEntity.java | 36 +++++++-------- .../req/basic/FilterBusTypePreRequest.java | 2 + .../basic/IBasicBusTypePreService.java | 8 ++++ .../impl/BasicBusTypePreServiceImpl.java | 5 ++ .../mapper/basic/BasicBusTypePreDao.xml | 10 ++++ 7 files changed, 85 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java index 7ac3bff1..cfdb1486 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java @@ -1,10 +1,14 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBusTypePreEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; @@ -47,8 +51,29 @@ public class BasicBusTypePreController { public BaseResponse filterList(FilterBusTypePreRequest filterBusTypePreRequest) { //查询扫码单据类型 BasicBussinessTypeEntity basicBussinessType = basicBussinessTypeService.findByAction(filterBusTypePreRequest.getAction()); - - return ResultVOUtils.success(null); + List basicBusTypePreEntities = basicBusTypePreService.findByAction(filterBusTypePreRequest.getAction()); + if (CollUtil.isEmpty(basicBusTypePreEntities)) { + //创建对应补单设置 + if (filterBusTypePreRequest.getType() != null && "changEnable".equals(filterBusTypePreRequest.getType())) { + if (ConstantType.TYPE_OUT.equals(basicBussinessType.getMainAction()) && !basicBussinessType.isAdvanceType()) { + BasicBusTypePreEntity basicBusTypePreEntity = new BasicBusTypePreEntity(); + basicBusTypePreEntity.setChangeType(ConstantStatus.ORDER_CHANGE_INNOR_NORMAL_IN); + basicBusTypePreEntity.setIndex(1); + basicBusTypePreEntity.setAction(filterBusTypePreRequest.getAction()); + basicBusTypePreEntity.setBeforeTime(1); + basicBusTypePreService.insertBusChangeType(basicBusTypePreEntity); + } else if (ConstantType.TYPE_OUT.equals(basicBussinessType.getMainAction()) && basicBussinessType.isAdvanceType()) { + BasicBusTypePreEntity basicBusTypePreEntity = new BasicBusTypePreEntity(); + basicBusTypePreEntity.setChangeType(ConstantStatus.ORDER_CHANGE_ADVANCE_IN); + basicBusTypePreEntity.setIndex(1); + basicBusTypePreEntity.setBeforeTime(1); + basicBusTypePreEntity.setAction(filterBusTypePreRequest.getAction()); + basicBusTypePreService.insertBusChangeType(basicBusTypePreEntity); + basicBusTypePreEntities = basicBusTypePreService.findByAction(filterBusTypePreRequest.getAction()); + } + } + } + return ResultVOUtils.success(basicBusTypePreEntities); } /** @@ -139,15 +164,14 @@ public class BasicBusTypePreController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } if (basicBusTypePreEntity != null) { - //TODO 补充补单单据类型仓库信息 - //if (StrUtil.isNotEmpty(basicBusTypePreEntity.getDefaultSubInv())) { - // InvWarehouseEntity byInvSubByCode = invWarehouseService.findByInvSubByCode(basicBusTypePreEntity.getDefaultSubInv()); - // basicBusTypePreEntity.setDefaultInv(invSubWarehouseEntity.getParentId()); - //} - //if (StrUtil.isNotEmpty(basicBusTypePreEntity.getLocSubInv())) { - // InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.findByInvSubByCode(basicBusTypePreEntity.getLocSubInv()); - // basicBusTypePreEntity.setLocInv(invSubWarehouseEntity.getParentId()); - //} + if (StrUtil.isNotBlank(basicBusTypePreEntity.getDefaultInvCode())) { + InvWarehouseEntity invWarehouse = invWarehouseService.findByInvSubByCode(basicBusTypePreEntity.getDefaultInvCode()); + basicBusTypePreEntity.setDefaultDeptCode(invWarehouse.getParentId()); + } + if (StrUtil.isNotBlank(basicBusTypePreEntity.getInvCode())) { + InvWarehouseEntity invWarehouse = invWarehouseService.findByInvSubByCode(basicBusTypePreEntity.getInvCode()); + basicBusTypePreEntity.setDeptCode(invWarehouse.getParentId()); + } basicBusTypePreService.insertBusChangeType(basicBusTypePreEntity); } else { ResultVOUtils.error(999, "参数错误"); diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java index c2be79fa..4f8275ee 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java @@ -24,4 +24,11 @@ public interface BasicBusTypePreDao extends BaseMapper { */ boolean deleteByAction(@Param("action") String action); + /** + * 通过单据类型编码查询补单设置列表 + * + * @param action + * @return + */ + List findByAction(String action); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java index 50f47ef7..3023e502 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java @@ -37,7 +37,7 @@ public class BasicBusTypePreEntity { * 转换扫码单序号 */ @TableField(value = "`index`") - private Byte index; + private Integer index; /** * 往前推移几天(单位:小时) @@ -49,31 +49,31 @@ public class BasicBusTypePreEntity { * 类型 */ @TableField(value = "changeType") - private Boolean changeType; + private Integer changeType; /** - * 补单默认仓库 + * 补单默认分库 */ - @TableField(value = "defaultInv") - private String defaultInv; + @TableField(value = "defaultDeptCode") + private String defaultDeptCode; /** - * 补单默认分库 + * 补单默认仓库 */ - @TableField(value = "defaultSubInv") - private String defaultSubInv; + @TableField(value = "defaultInvCode") + private String defaultInvCode; /** - * 补单当前仓库 + * 补单当前部门 */ - @TableField(value = "locInv") - private String locInv; + @TableField(value = "deptCode") + private String deptCode; /** - * 补单当前分库 + * 补单当前仓库 */ - @TableField(value = "locSubInv") - private String locSubInv; + @TableField(value = "invCode") + private String invCode; /** * 原单据类型 @@ -135,13 +135,13 @@ public class BasicBusTypePreEntity { public static final String COL_CHANGETYPE = "changeType"; - public static final String COL_DEFAULTINV = "defaultInv"; + public static final String COL_DEFAULTDEPTCODE = "defaultDeptCode"; - public static final String COL_DEFAULTSUBINV = "defaultSubInv"; + public static final String COL_DEFAULTINVCODE = "defaultInvCode"; - public static final String COL_LOCINV = "locInv"; + public static final String COL_DEPTCODE = "deptCode"; - public static final String COL_LOCSUBINV = "locSubInv"; + public static final String COL_INVCODE = "invCode"; public static final String COL_ORIGINACTION = "originAction"; diff --git a/src/main/java/com/glxp/api/req/basic/FilterBusTypePreRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBusTypePreRequest.java index c7d3decb..25963b91 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterBusTypePreRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterBusTypePreRequest.java @@ -19,4 +19,6 @@ public class FilterBusTypePreRequest extends ListPageRequest { */ private String thirdAction; + private String type; + } diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java index 4ed8a54b..38873b1d 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java @@ -51,4 +51,12 @@ public interface IBasicBusTypePreService { * @return */ boolean insertBusChangeType(BasicBusTypePreEntity basicBusTypePreEntity); + + /** + * 通过单据类型编码查询补单设置 + * + * @param action + * @return + */ + List findByAction(String action); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index d2f3f5bd..925c1247 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -54,6 +54,11 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { return basicBusTypePreDao.insert(basicBusTypePreEntity) != 0; } + @Override + public List findByAction(String action) { + return basicBusTypePreDao.findByAction(action); + } + /** * 设置创建/更新信息 * diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml index 98ccfce0..af3eae3e 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml @@ -11,4 +11,14 @@ from basic_bustype_pre where action = #{action} + + \ No newline at end of file