From 584bbcaed652b72208a078a4f740a30382094f56 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 26 Feb 2024 15:50:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E4=BD=BF=E7=94=A8=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=96=B0=E5=A2=9E=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E7=B1=BB=E5=9E=8B=EF=BC=8C=E4=BD=BF=E7=94=A8=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E6=8B=86=E5=8D=95=E8=A1=A5=E5=8D=95=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicBusTypePreController.java | 31 ++++-- .../inout/IoCodeTempController.java | 98 ++++++++++++++----- .../api/dao/basic/BasicBusTypePreDao.java | 2 +- .../entity/basic/BasicBusTypePreEntity.java | 21 +++- .../basic/BasicBussinessTypeEntity.java | 2 +- .../api/entity/basic/UdiRelevanceEntity.java | 6 ++ .../req/basic/BussinessTypeSaveRequest.java | 2 +- .../basic/CompanyProductRelevanceRequest.java | 5 + .../api/req/basic/FilterUdiInfoRequest.java | 5 + .../api/req/basic/FilterUdiRelRequest.java | 4 + .../glxp/api/req/basic/SupplementRequest.java | 1 + .../api/req/basic/UdiRelevanceRequest.java | 4 + .../req/basic/UdiRelevanceSaveRequest.java | 4 + .../res/basic/BasicBussinessTypeResponse.java | 3 + .../CompanyProductRelevanceResponse.java | 4 + .../api/res/basic/UdiRelevanceResponse.java | 4 + .../glxp/api/res/basic/UdiRlSupResponse.java | 4 + .../glxp/api/res/thrsys/UdiInfoResponse.java | 4 + .../basic/IBasicBusTypePreService.java | 2 + .../service/basic/UdiRelevanceService.java | 2 + .../impl/BasicBusTypePreServiceImpl.java | 20 +++- .../basic/impl/UdiRelevanceServiceImpl.java | 9 ++ .../api/service/inout/IoAddInoutService.java | 94 +++++++++++------- .../service/inout/IoChangeInoutService.java | 83 ++++++++++++---- .../com/glxp/api/util/SupplementVailUtil.java | 6 ++ .../mapper/basic/BasicBusTypePreDao.xml | 51 +++++----- .../basic/CompanyProductRelevanceDao.xml | 1 + .../mybatis/mapper/basic/UdiRelevanceDao.xml | 15 +-- .../mybatis/mapper/basic/UdiRlSupDao.xml | 2 +- src/main/resources/schemas/schema_v2.1.sql | 1 + src/main/resources/schemas/schema_v2.4.sql | 6 ++ 31 files changed, 365 insertions(+), 131 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 c4db5a6c2..d3758b02c 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java @@ -3,6 +3,7 @@ package com.glxp.api.controller.basic; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; @@ -21,6 +22,7 @@ import com.glxp.api.res.basic.BasicBusTypePreResponse; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBusTypePreService; import com.glxp.api.service.basic.IBasicBussinessTypeService; +import com.glxp.api.util.IntUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; @@ -169,11 +171,14 @@ public class BasicBusTypePreController { } if (basicBusTypePreEntity != null) { //判断是否重复添加 - boolean result = basicBusTypePreService.verifyExists(basicBusTypePreEntity); - if (result) { - return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "原单据类型已存在，不允许重复添加！"); + if (IntUtil.value(basicBusTypePreEntity.getSplitOrder()) < 1) { + boolean result = basicBusTypePreService.verifyExists(basicBusTypePreEntity); + if (result) { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "原单据类型已存在，不允许重复添加！"); + } } - if(basicBusTypePreEntity.getAction().equals(basicBusTypePreEntity.getOriginAction())){ + + if (basicBusTypePreEntity.getAction().equals(basicBusTypePreEntity.getOriginAction())) { return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "出入库单与目标出入库单相同！"); } @@ -197,15 +202,25 @@ public class BasicBusTypePreController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - if(basicBusTypePreEntity.getAction().equals(basicBusTypePreEntity.getOriginAction())){ + if (basicBusTypePreEntity.getAction().equals(basicBusTypePreEntity.getOriginAction())) { return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "出入库单与目标出入库单相同!"); } if (basicBusTypePreEntity != null) { //判断是否重复添加 - boolean result = basicBusTypePreService.verifyExists(basicBusTypePreEntity); - if (result) { - return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "原单据类型已存在，不允许重复添加！"); + + + //校验是否允许存在多个相同的单据类型 + if (IntUtil.value(basicBusTypePreEntity.getSplitOrder()) < 1) { + long count = basicBusTypePreService.count(new QueryWrapper().eq("action", basicBusTypePreEntity.getAction())); + if (count > 0) { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "原单据类型已存在，不允许重复添加！"); + } + } else { + boolean result = basicBusTypePreService.verifyExists(basicBusTypePreEntity); + if (result) { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "原单据类型已存在，不允许重复添加！"); + } } if (StrUtil.isNotBlank(basicBusTypePreEntity.getDefaultInvCode())) { diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 75712ea9a..1076d985b 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -416,8 +416,6 @@ public class IoCodeTempController extends BaseController { //过期提醒： -// SystemParamConfigEntity expireParamConfigEntity = systemParamConfigService.selectByParamKey("expire_date_tip"); - //IntUtil.value(bussinessTypeEntity.getCheckVailDate()) == 1 && !addOrderRequest.isIgnoreExpire() if (IntUtil.value(bussinessTypeEntity.getCheckExpire()) == 1 && !addOrderRequest.isIgnoreExpire()) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { String expireDate = "20" + udiEntity.getExpireDate(); @@ -437,8 +435,8 @@ public class IoCodeTempController extends BaseController { } } UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); + //近效期提醒 -// SystemParamConfigEntity recentParamConfigEntity = systemParamConfigService.selectByParamKey("recent_date_tip"); long recent = 0; if (udiRelevanceResponse.getRecentDateTime() != null) recent = udiRelevanceResponse.getRecentDateTime().longValue(); @@ -469,7 +467,6 @@ public class IoCodeTempController extends BaseController { if (resultTime > 0) { long time = resultTime / (24 * 60 * 60 * 1000); if (resultTime < recentTieme) { -// return ResultVOUtils.error(605, "当前产品临近过期，距过期还剩" + time + "天,无法添加！"); return ResultVOUtils.error(505, "当前产品临近过期，距过期还剩" + time + "天,是否确定继续添加?"); } } @@ -488,7 +485,7 @@ public class IoCodeTempController extends BaseController { } //校验预验收库存是否已存在 - if (bussinessTypeEntity.isScanPreIn()) { + if (bussinessTypeEntity.isScanPreIn() && checkDiAttribute(bussinessTypeEntity, udiRelevanceResponse, 2)) { if (bussinessTypeEntity.getBackPreinType() == 1 && bussinessTypeEntity.isPreInBack()) {//按单出库&& bussinessTypeEntity.isPreInBack() String orderIds = addOrderRequest.getCheckPreInOrders(); if (StrUtil.isNotEmpty(orderIds)) { @@ -559,13 +556,26 @@ public class IoCodeTempController extends BaseController { // IoCodeTempEntity codeTempEntity = isExitToatal(code, codeEnttitys); //校验库存 BaseResponse invRes = null; - if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 - invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity, false); - } else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存 - invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity, false); + if (IntUtil.value(bussinessTypeEntity.getUseDyCount()) == 2) { + if (bussinessTypeEntity.isScanPreIn() && checkDiAttribute(bussinessTypeEntity, udiRelevanceResponse, 2)) { //校验预验收库存 + invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity, false); + } + if (bussinessTypeEntity.isAdvancePreIn() && checkDiAttribute(bussinessTypeEntity, udiRelevanceResponse, 3)) { //校验寄售库存 + invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity, false); + } + if (bussinessTypeEntity.isVailInv() && checkDiAttribute(bussinessTypeEntity, udiRelevanceResponse, 1)) { + invRes = checkInv(bussinessTypeEntity, genDetaiEntity, false); + } } else { - invRes = checkInv(bussinessTypeEntity, genDetaiEntity, false); + if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 + invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity, false); + } else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存 + invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity, false); + } else { + invRes = checkInv(bussinessTypeEntity, genDetaiEntity, false); + } } + if (invRes != null) { return invRes; } @@ -736,25 +746,51 @@ public class IoCodeTempController extends BaseController { } - if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 - BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity, false); - if (invRes != null) { - deleteEmptyBillNo(orderEntity); - return invRes; + if (IntUtil.value(bussinessTypeEntity.getUseDyCount()) == 2) { + if (bussinessTypeEntity.isScanPreIn() && checkDiAttribute(bussinessTypeEntity, udiRelevanceResponse, 2)) { //校验预验收库存 + BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity, false); + if (invRes != null) { + deleteEmptyBillNo(orderEntity); + return invRes; + } } - } else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存 - BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity, false); - if (invRes != null) { - deleteEmptyBillNo(orderEntity); - return invRes; + if (bussinessTypeEntity.isAdvancePreIn() && checkDiAttribute(bussinessTypeEntity, udiRelevanceResponse, 3)) { //校验寄售库存 + BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity, false); + if (invRes != null) { + deleteEmptyBillNo(orderEntity); + return invRes; + } + } + if (bussinessTypeEntity.isVailInv() && checkDiAttribute(bussinessTypeEntity, udiRelevanceResponse, 1)) { + BaseResponse invRes = checkInv(bussinessTypeEntity, codeEnttity, false); + if (invRes != null) { + deleteEmptyBillNo(orderEntity); + return invRes; + } } } else { - BaseResponse invRes = checkInv(bussinessTypeEntity, codeEnttity, false); - if (invRes != null) { - deleteEmptyBillNo(orderEntity); - return invRes; + if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 + BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity, false); + if (invRes != null) { + deleteEmptyBillNo(orderEntity); + return invRes; + } + } else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存 + BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity, false); + if (invRes != null) { + deleteEmptyBillNo(orderEntity); + return invRes; + } + } else { + BaseResponse invRes = checkInv(bussinessTypeEntity, codeEnttity, false); + if (invRes != null) { + deleteEmptyBillNo(orderEntity); + return invRes; + } } } + + //是否边扫边校验 if (bussinessTypeEntity.getCheckWebNew() == 1 && bussinessTypeEntity.isCheckEnable()) { String errMsg = ioCheckInoutService.checkCode(codeEnttity); @@ -1813,5 +1849,19 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.success(addCodeResult); } + /** + * @param udiRelevanceResponse + * @param purType 1:入账库；2：预验收库；3：寄售库 + */ + public boolean checkDiAttribute(BasicBussinessTypeEntity bussinessTypeEntity, UdiRelevanceResponse udiRelevanceResponse, Integer purType) { + if (bussinessTypeEntity.getUseDyCount() == 2) { + if (IntUtil.value(udiRelevanceResponse.getPurType()) == IntUtil.value(purType)) { + return true; + } else + return false; + } + + return true; + } } 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 002e478b5..837c5f366 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java @@ -32,7 +32,7 @@ public interface BasicBusTypePreDao extends BaseMapperPlus findByAction(String action); + List findByAction(@Param("action") String action, @Param("originAction") String originAction); /** * 查询单据流转列表数据 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 6f25d2f2f..97b2a75fd 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java @@ -123,24 +123,37 @@ public class BasicBusTypePreEntity { @TableField(value = "remark") private String remark; -// 创建单模式：1：送货至入库单模式；2.向上级补单模式；3.预验收转入库单模式，4.寄售转入库单模式，5.退货向上级补单模式 - + /** + * 创建单模式：1：送货至入库单模式；2.向上级补单模式；3.预验收转入库单模式，4.寄售转入库单模式，5.退货向上级补单模式 + */ @TableField(value = "createType") private int createType; - /** * 目标业务单 */ @TableField(value = "targetBusAction") private String targetBusAction; + /** + * 业务单据补单时间间隔 + */ @TableField(value = "busBeforeTime") private Integer busBeforeTime; + /** + * 生成扫码单据单据状态 + */ @TableField(value = "auditStatus") private Integer auditStatus; + /** + * 生成业务单据单据状态 + */ @TableField(value = "busAuditStatus") private Integer busAuditStatus; - + /** + * 单据拆单模式： 0：无需拆单，1：入账库；2:预验收库；3:寄售仓库 + */ + @TableField(value = "splitOrder") + private Integer splitOrder; @TableField(exist = false) public static final String COL_ID = "id"; diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index b52f0074c..d85f3ef4a 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -197,7 +197,7 @@ public class BasicBussinessTypeEntity { private boolean secCheckBalance; /** - * 允许科室多次使用出库 + * 物资使用出库模式 0:正常，1：物资多次使用出库；2：科室集合使用出库 */ @TableField(value = "useDyCount") private int useDyCount; diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index 6159afb03..88ac7f7ad 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -97,6 +97,12 @@ public class UdiRelevanceEntity { @TableField(value = "isAdavence") private Boolean isAdavence; + + /** + * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 + */ + @TableField(value = "purType") + private Integer purType; /** * 是否允许多次使用出库 */ diff --git a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java index 604631f3b..0d161f0a7 100644 --- a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java @@ -163,7 +163,7 @@ public class BussinessTypeSaveRequest { private Boolean secCheckBalance; /** - * 允许科室多次使用出库 + * 物资使用出库模式 0:正常，1：物资多次使用出库；2：科室集合使用出库 */ private Integer useDyCount; diff --git a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java index 403d5b863..f92a4328b 100644 --- a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java @@ -50,6 +50,11 @@ public class CompanyProductRelevanceRequest extends ListPageRequest { private Boolean isAdavence; private String unitFk; + /** + * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 + */ + private Integer purType; + private String corpId; private String billType; private String manufactory; diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java index 22f4784a4..12ad4f200 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java @@ -1,6 +1,7 @@ package com.glxp.api.req.basic; +import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @@ -45,6 +46,10 @@ public class FilterUdiInfoRequest extends ListPageRequest { private String udplatCode; private String mainId; private Boolean isAdavence; + /** + * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 + */ + private Integer purType; private String corpId; private String billType; diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index 688c5a6a0..8e60c243a 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -51,6 +51,10 @@ public class FilterUdiRelRequest extends ListPageRequest { private String udplatCode; private String mainId; private Boolean isAdavence; + /** + * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 + */ + private Integer purType; private String corpId; private String billType; diff --git a/src/main/java/com/glxp/api/req/basic/SupplementRequest.java b/src/main/java/com/glxp/api/req/basic/SupplementRequest.java index de5f59eaf..163e5c5f1 100644 --- a/src/main/java/com/glxp/api/req/basic/SupplementRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SupplementRequest.java @@ -22,4 +22,5 @@ public class SupplementRequest { private String spmc; private String cpms; private String price; + private Integer purType; } diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java index 5217a10b4..f829f1025 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java @@ -30,6 +30,10 @@ public class UdiRelevanceRequest { private Integer lockStatus; private String udplatCode; private Boolean isAdavence; + /** + * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 + */ + private Integer purType; private String supName; private String originUuid; private String price; diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java index e0b6bc66b..6e66e947d 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java @@ -22,6 +22,10 @@ public class UdiRelevanceSaveRequest { private Boolean isLock; private Integer lockStatus; private Boolean isAdavence; + /** + * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 + */ + private Integer purType; private Boolean useMuti; private Integer useNum; private String supName; diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java index e2bb3e332..a952a43ab 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -83,6 +83,9 @@ public class BasicBussinessTypeResponse { private int checkBalance; private boolean secCheckBalance; + /** + * 物资使用出库模式 0:正常，1：物资多次使用出库；2：科室集合使用出库 + */ private int useDyCount; private boolean expireTip; diff --git a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java index 68bb07357..03ad43a1e 100644 --- a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java @@ -58,6 +58,10 @@ public class CompanyProductRelevanceResponse { private String mainId; private String mainName; private Boolean isAdavence; + /** + * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 + */ + private Integer purType; private String scbssfbhph; private String scbssfbhxlh; diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index e362dafcc..a3aa86775 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -23,6 +23,10 @@ public class UdiRelevanceResponse { private Boolean isLock; private Integer lockStatus; private Boolean isAdavence; + /** + * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 + */ + private Integer purType; private Boolean useMuti; private Integer useNum; private String supName; diff --git a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java index ba5cfb319..7d67fee56 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java @@ -58,6 +58,10 @@ public class UdiRlSupResponse { private String mainId; private String mainName; private Boolean isAdavence; + /** + * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 + */ + private Integer purType; private String scbssfbhph; private String scbssfbhxlh; diff --git a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java index cf6667325..67c5bc276 100644 --- a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java @@ -60,6 +60,10 @@ public class UdiInfoResponse { private Integer status; private String supId; private boolean isAdavence; + /** + * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 + */ + private Integer purType; private boolean isDisable; private boolean useMuti; 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 5a3094e6a..6c1051eca 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java @@ -64,6 +64,8 @@ public interface IBasicBusTypePreService extends IService */ List findByAction(String action); + List findByOiginActions(String originAction); + /** * 查询单据流转列表数据 * diff --git a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java index b7120143f..ab15fb702 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java @@ -105,4 +105,6 @@ public interface UdiRelevanceService extends IService { String getRelIdByUdiCode(String code); UdiRelevanceResponse selectOneUdi(FilterUdiRelRequest filterUdiRelRequest); + + Integer findPurType(Long relId); } 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 1cb7f7eaa..32a3cabe8 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 @@ -11,6 +11,7 @@ import com.glxp.api.req.basic.FilterBusTypePreRequest; import com.glxp.api.res.basic.BasicBusTypePreResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.IBasicBusTypePreService; +import com.glxp.api.util.IntUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -62,7 +63,12 @@ public class BasicBusTypePreServiceImpl extends ServiceImpl findByAction(String action) { - return basicBusTypePreDao.findByAction(action); + return basicBusTypePreDao.findByAction(action, null); + } + + @Override + public List findByOiginActions(String originAction) { + return basicBusTypePreDao.findByAction(null, originAction); } @Override @@ -83,16 +89,18 @@ public class BasicBusTypePreServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq("action", basicBusTypePreEntity.getAction()) .eq("originAction", basicBusTypePreEntity.getOriginAction()) - .eq(null !=basicBusTypePreEntity.getInvCode(),"invCode", basicBusTypePreEntity.getInvCode()) + .eq(null != basicBusTypePreEntity.getInvCode(), "invCode", basicBusTypePreEntity.getInvCode()) .eq(null != basicBusTypePreEntity.getBeforeTime(), "beforeTime", basicBusTypePreEntity.getBeforeTime()) .eq(null != basicBusTypePreEntity.getDefaultInvCode(), "defaultInvCode", basicBusTypePreEntity.getDefaultInvCode()) .eq(null != basicBusTypePreEntity.getSupplementAll(), "supplementAll", basicBusTypePreEntity.getSupplementAll()) - .eq(null != basicBusTypePreEntity.getAuditStatus(),"auditStatus",basicBusTypePreEntity.getAuditStatus()) - .eq(null != basicBusTypePreEntity.getBusAuditStatus(),"busAuditStatus",basicBusTypePreEntity.getBusAuditStatus()); - + .eq(null != basicBusTypePreEntity.getAuditStatus(), "auditStatus", basicBusTypePreEntity.getAuditStatus()) + .eq(null != basicBusTypePreEntity.getBusAuditStatus(), "busAuditStatus", basicBusTypePreEntity.getBusAuditStatus()); List list = basicBusTypePreDao.selectList(wrapper); if (CollUtil.isNotEmpty(list)) { if (null != basicBusTypePreEntity.getId()) { @@ -105,6 +113,8 @@ public class BasicBusTypePreServiceImpl extends ServiceImpl().select("purType").eq("id", relId).last("limit 1")); + return IntUtil.value(udiRelevanceEntity.getPurType()); + } + + } diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index 96ded973e..843cfd89d 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -677,16 +677,16 @@ public class IoAddInoutService { break; } } - if (isMuti){ + if (isMuti) { //过滤掉库存数量为0的供应商 - if (relId != null && StrUtil.isNotEmpty(batchNo)){ - unitFks = invProductService.filterReCount(relId,batchNo,unitFks); - if (unitFks!=null && unitFks.size() == 1){ + if (relId != null && StrUtil.isNotEmpty(batchNo)) { + unitFks = invProductService.filterReCount(relId, batchNo, unitFks); + if (unitFks != null && unitFks.size() == 1) { return unitFks.get(0); } } return "MUTI"; //绑定多个供应商 - }else return unitFk; + } else return unitFk; } return null; } @@ -931,34 +931,40 @@ public class IoAddInoutService { InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByOne(ConstantStatus.ACTION_TYPE_PREIN); for (IoCodeTempEntity codeTempEntity : codeTempEntities) { - int count = 0; - if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_NULL) { - if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) { - count = invPreinProductDetailService.vailStockCountByCode(null, invWarehouseEntity.getCode(), null, codeTempEntity.getCode()); - } else - count = invPreinProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), null); - } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_SET) { - if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) { - count = invPreinProductDetailService.vailStockCountByCode(null, invWarehouseEntity.getCode(), codeTempEntity.getPreInSpaceCode(), codeTempEntity.getCode()); - } else - count = invPreinProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), codeTempEntity.getPreInSpaceCode()); - } - if (count < IntUtil.value(codeTempEntity.getReCount())) { - return ResultVOUtils.error(500, "UDI码：" + codeTempEntity.getCode() + "预验收库存数量不足！"); + + + if (checkDiAttribute(bussinessTypeEntity, codeTempEntity.getRelId(), 2)) { + int count = 0; + if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_NULL) { + if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) { + count = invPreinProductDetailService.vailStockCountByCode(null, invWarehouseEntity.getCode(), null, codeTempEntity.getCode()); + } else + count = invPreinProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), null); + } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_SET) { + if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) { + count = invPreinProductDetailService.vailStockCountByCode(null, invWarehouseEntity.getCode(), codeTempEntity.getPreInSpaceCode(), codeTempEntity.getCode()); + } else + count = invPreinProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), codeTempEntity.getPreInSpaceCode()); + } + if (count < IntUtil.value(codeTempEntity.getReCount())) { + return ResultVOUtils.error(500, "UDI码：" + codeTempEntity.getCode() + "预验收库存数量不足！"); + } } } } else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存 InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByOne(ConstantStatus.ACTION_TYPE_ADVANCE); for (IoOrderDetailBizEntity orderDetailCodeEntity : orderDetailBizEntities) { - int count = 0; - if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_NULL) { - count = invPreProductDetailService.vailStockCount(orderDetailCodeEntity.getBindRlFk(), orderDetailCodeEntity.getBatchNo(), orderDetailCodeEntity.getSupId(), null, invWarehouseEntity.getCode(), null); - } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_SET) { - count = invPreProductDetailService.vailStockCount(orderDetailCodeEntity.getBindRlFk(), orderDetailCodeEntity.getBatchNo(), orderDetailCodeEntity.getSupId(), null, invWarehouseEntity.getCode(), orderEntity.getPreCurSpaceCode()); - } - if (count < orderDetailCodeEntity.getScanCount()) { - return ResultVOUtils.error(500, "提交失败，" + orderDetailCodeEntity.getCoName() + "库存数量不足！"); + if (checkDiAttribute(bussinessTypeEntity, orderDetailCodeEntity.getBindRlFk(), 3)) { + int count = 0; + if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_NULL) { + count = invPreProductDetailService.vailStockCount(orderDetailCodeEntity.getBindRlFk(), orderDetailCodeEntity.getBatchNo(), orderDetailCodeEntity.getSupId(), null, invWarehouseEntity.getCode(), null); + } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_SET) { + count = invPreProductDetailService.vailStockCount(orderDetailCodeEntity.getBindRlFk(), orderDetailCodeEntity.getBatchNo(), orderDetailCodeEntity.getSupId(), null, invWarehouseEntity.getCode(), orderEntity.getPreCurSpaceCode()); + } + if (count < orderDetailCodeEntity.getScanCount()) { + return ResultVOUtils.error(500, "提交失败，" + orderDetailCodeEntity.getCoName() + "库存数量不足！"); + } } } @@ -970,14 +976,16 @@ public class IoAddInoutService { outInvCode = invWarehouseEntity.getCode(); } for (IoOrderDetailBizEntity orderDetailCodeEntity : orderDetailBizEntities) { - int count = 0; - if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_NULL) { - count = invProductDetailService.vailStockCount(orderDetailCodeEntity.getBindRlFk(), orderDetailCodeEntity.getBatchNo(), orderDetailCodeEntity.getSupId(), null, outInvCode, null); - } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_SET) { - count = invProductDetailService.vailStockCount(orderDetailCodeEntity.getBindRlFk(), orderDetailCodeEntity.getBatchNo(), orderDetailCodeEntity.getSupId(), orderEntity.getDeptCode(), orderEntity.getInvCode(), orderEntity.getCurSpaceCode()); - } - if (count < orderDetailCodeEntity.getScanCount()) { - return ResultVOUtils.error(500, "提交失败，" + orderDetailCodeEntity.getCoName() + "库存数量不足！"); + if (checkDiAttribute(bussinessTypeEntity, orderDetailCodeEntity.getBindRlFk(), 1)) { + int count = 0; + if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_NULL) { + count = invProductDetailService.vailStockCount(orderDetailCodeEntity.getBindRlFk(), orderDetailCodeEntity.getBatchNo(), orderDetailCodeEntity.getSupId(), null, outInvCode, null); + } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_SET) { + count = invProductDetailService.vailStockCount(orderDetailCodeEntity.getBindRlFk(), orderDetailCodeEntity.getBatchNo(), orderDetailCodeEntity.getSupId(), orderEntity.getDeptCode(), orderEntity.getInvCode(), orderEntity.getCurSpaceCode()); + } + if (count < orderDetailCodeEntity.getScanCount()) { + return ResultVOUtils.error(500, "提交失败，" + orderDetailCodeEntity.getCoName() + "库存数量不足！"); + } } } } @@ -985,6 +993,20 @@ public class IoAddInoutService { return null; } + /** + * + */ + public boolean checkDiAttribute(BasicBussinessTypeEntity bussinessTypeEntity, Long relId, Integer purType) { + if (bussinessTypeEntity.getUseDyCount() == 2) { + if (udiRelevanceService.findPurType(relId) == IntUtil.value(purType)) { + return true; + } else + return false; + } + + + return true; + } /** * 手持终端上传校验价格 @@ -1068,6 +1090,4 @@ public class IoAddInoutService { } - - } diff --git a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java index 00899bc97..b9610dd95 100644 --- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inout; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.inout.impl.IoCodeService; @@ -148,7 +149,14 @@ public class IoChangeInoutService { @Resource UdiRelevanceService udiRelevanceService; - //生成单据 + /** + * 单据补单 + * + * @param bussinessChangeTypeEntity + * @param useInList + * @param orderEntity + * @param isGenInovice + */ public void buildInOrder(BasicBusTypePreEntity bussinessChangeTypeEntity, List useInList, IoOrderEntity orderEntity, boolean isGenInovice) { @@ -160,30 +168,62 @@ public class IoChangeInoutService { return; } + //是否根据耗材属性拆单 + if (IntUtil.value(bussinessChangeTypeEntity.getSplitOrder()) > 0) { + List busTypePreEntities = basicBusTypePreService.findByOiginActions(orderEntity.getAction()); + if (CollUtil.isNotEmpty(busTypePreEntities)) { - BasicBussinessTypeEntity targetBustypeEntity = basicBussinessTypeService.findByAction(bussinessChangeTypeEntity.getAction()); -// buildGenOrder(targetBustypeEntity, bussinessChangeTypeEntity, useInList, orderEntity, isGenInovice); - List groupBuyList = new ArrayList<>(); - List unGroupBuyList = new ArrayList<>(); - if (IntUtil.value(targetBustypeEntity.getGroupBuySplit()) == 1) { - //过滤集采、非集采 - for (IoCodeEntity codeEntity : useInList) { - UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(codeEntity.getRelId()); - if (IntUtil.value(udiRelevanceEntity.getGroupBuy())) { - groupBuyList.add(codeEntity); - } else { - unGroupBuyList.add(codeEntity); + List normalCodes = new ArrayList<>(); + List preInCodes = new ArrayList<>(); + List preCodes = new ArrayList<>(); + + for (IoCodeEntity codeEntity : useInList) { + + if (udiRelevanceService.findPurType(codeEntity.getRelId()) == ConstantStatus.ACTION_TYPE_NORMAL) { + normalCodes.add(codeEntity); + } else if (udiRelevanceService.findPurType(codeEntity.getRelId()) == ConstantStatus.ACTION_TYPE_PREIN) { + preInCodes.add(codeEntity); + } else if (udiRelevanceService.findPurType(codeEntity.getRelId()) == ConstantStatus.ACTION_TYPE_ADVANCE) { + preCodes.add(codeEntity); + } + } + BasicBussinessTypeEntity targetBustypeEntity; + for (BasicBusTypePreEntity busTypePreEntity : busTypePreEntities) { + targetBustypeEntity = basicBussinessTypeService.findByAction(busTypePreEntity.getAction()); + if (busTypePreEntity.getSplitOrder() == ConstantStatus.ACTION_TYPE_NORMAL) { + buildGenOrder(targetBustypeEntity, busTypePreEntity, normalCodes, orderEntity, isGenInovice); + } else if (busTypePreEntity.getSplitOrder() == ConstantStatus.ACTION_TYPE_PREIN) { + buildGenOrder(targetBustypeEntity, busTypePreEntity, preInCodes, orderEntity, isGenInovice); + } else if (busTypePreEntity.getSplitOrder() == ConstantStatus.ACTION_TYPE_ADVANCE) { + buildGenOrder(targetBustypeEntity, busTypePreEntity, preCodes, orderEntity, isGenInovice); + } } } - if (CollUtil.isNotEmpty(groupBuyList)) { - buildGenOrder(targetBustypeEntity, bussinessChangeTypeEntity, groupBuyList, orderEntity, isGenInovice); - } - if (CollUtil.isNotEmpty(unGroupBuyList)) { - buildGenOrder(targetBustypeEntity, bussinessChangeTypeEntity, unGroupBuyList, orderEntity, isGenInovice); + } else { + //补单根据集采、非集采拆单 + BasicBussinessTypeEntity targetBustypeEntity = basicBussinessTypeService.findByAction(bussinessChangeTypeEntity.getAction()); + List groupBuyList = new ArrayList<>(); + List unGroupBuyList = new ArrayList<>(); + if (IntUtil.value(targetBustypeEntity.getGroupBuySplit()) == 1) { + for (IoCodeEntity codeEntity : useInList) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(codeEntity.getRelId()); + if (IntUtil.value(udiRelevanceEntity.getGroupBuy())) { + groupBuyList.add(codeEntity); + } else { + unGroupBuyList.add(codeEntity); + } + } + if (CollUtil.isNotEmpty(groupBuyList)) { + buildGenOrder(targetBustypeEntity, bussinessChangeTypeEntity, groupBuyList, orderEntity, isGenInovice); + } + if (CollUtil.isNotEmpty(unGroupBuyList)) { + buildGenOrder(targetBustypeEntity, bussinessChangeTypeEntity, unGroupBuyList, orderEntity, isGenInovice); + } + + } else { + buildGenOrder(targetBustypeEntity, bussinessChangeTypeEntity, useInList, orderEntity, isGenInovice); } - } else { - buildGenOrder(targetBustypeEntity, bussinessChangeTypeEntity, useInList, orderEntity, isGenInovice); } @@ -342,10 +382,11 @@ public class IoChangeInoutService { //根据单据设置状态 1:草稿 if (bussinessChangeTypeEntity.getAuditStatus() == 1) { outOrder.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); + outOrder.setDealStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); orderService.update(outOrder); for (IoCodeTempEntity codeTempEntity : codeTempEntities) { - addInoutService.genOrderDetailCode(orderEntity, codeTempEntity); + addInoutService.genOrderDetailCode(outOrder, codeTempEntity); } } else if (bussinessChangeTypeEntity.getAuditStatus() == 2 || bussinessChangeTypeEntity.getAuditStatus() == 3) { diff --git a/src/main/java/com/glxp/api/util/SupplementVailUtil.java b/src/main/java/com/glxp/api/util/SupplementVailUtil.java index 179126805..054635884 100644 --- a/src/main/java/com/glxp/api/util/SupplementVailUtil.java +++ b/src/main/java/com/glxp/api/util/SupplementVailUtil.java @@ -77,6 +77,12 @@ public class SupplementVailUtil { return "产品价格不能为空"; } } + basicProductSetEntity = basicProductSetEntityMap.get("purType"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmptyIfStr(supplementRequest.getPurType())) { + return "采购类型不能为空"; + } + } basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak1"); diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml index 9981005ce..ce9d05c80 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml @@ -19,30 +19,37 @@ - + insert into basic_bustype_pre @@ -88,7 +96,7 @@ targetBusAction, busBeforeTime, auditStatus, - busAuditStatus,createType, + busAuditStatus, createType, values @@ -143,8 +151,7 @@ busBeforeTime = #{busBeforeTime,jdbcType=TINYINT}, auditStatus = #{auditStatus,jdbcType=TINYINT}, busAuditStatus = #{busAuditStatus,jdbcType=TINYINT}, - createType = #{createType,jdbcType=TINYINT}, + createType = #{createType,jdbcType=TINYINT}, - diff --git a/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml index f5cc47061..05d36d910 100644 --- a/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml @@ -99,6 +99,7 @@ basic_corp.name companyName, basic_udirel.mainId, basic_udirel.isAdavence, + basic_udirel.purType, basic_products.scbssfbhph, basic_products.scbssfbhxlh, basic_products.scbssfbhscrq, diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index eae9305f1..9ae9c059b 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -1228,7 +1228,7 @@ INTO basic_udirel (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, isLock, - lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, + lockStatus, isAdavence,purType, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, updateUser, remark, useExpireTime, dispatch, groupBuy, needCert) values (#{id}, @@ -1244,7 +1244,7 @@ #{isDisable}, #{isLock}, #{lockStatus}, - #{isAdavence}, + #{isAdavence},#{purType}, #{useMuti}, #{useNum}, #{supName}, @@ -1263,7 +1263,7 @@ INTO basic_udirel (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, isLock, - lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, + lockStatus, isAdavence,purType, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, updateUser, remark, useExpireTime, dispatch, groupBuy, needCert) values (#{id}, @@ -1279,7 +1279,7 @@ #{isDisable}, #{isLock}, #{lockStatus}, - #{isAdavence}, + #{isAdavence},#{purType}, #{useMuti}, #{useNum}, #{supName}, @@ -1353,6 +1353,9 @@ isAdavence=#{isAdavence}, + + purType=#{purType}, + useMuti=#{useMuti}, @@ -1432,7 +1435,7 @@ into basic_udirel (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, isLock, - lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, + lockStatus, isAdavence,purType, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, updateUser, remark, useExpireTime, dispatch, groupBuy, needCert) values @@ -1451,7 +1454,7 @@ #{item.isDisable}, #{item.isLock}, #{item.lockStatus}, - #{item.isAdavence}, + #{item.isAdavence},#{item.purType}, #{item.useMuti}, #{item.useNum}, #{item.supName}, diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml index 367b54a95..a3426cf27 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml @@ -46,7 +46,7 @@ basic_udirel.lockStatus, basic_udirel.mainId, basic_udirel.isAdavence, - + basic_udirel.purType, basic_udirel.lowStockNum, basic_udirel.overStockNum, basic_udirel.recentDateTime, diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 3865c6573..a1bab0333 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -608,3 +608,4 @@ CALL Pro_Temp_ColumnWork('io_order', 'fromSpmsOrders', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkReview', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'secCheckReview', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckReview', 'tinyint', 1); + diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index b13a17bc3..a02cd6324 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -503,5 +503,11 @@ SET FOREIGN_KEY_CHECKS = 1; CALL Pro_Temp_ColumnWork('thr_corp', 'kfdm', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'purType', 'tinyint', 1); + + +INSERT ignore INTO basic_product_set(`id`, `parmName`, `parmKey`, `enable`, `supSelect`, `supAdd`, `localAdd`, `remark`, + `sort`, `localEdit`) +VALUES (33, '采购类型', 'purType', 1, 1, 1, 0, '采购类型是否必填字段', 65, 1);