From 731976a40c9d3ffb712778424ee184298fdcf857 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 8 Mar 2023 17:39:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9D=A1=E7=A0=81=E5=AE=8C?= =?UTF-8?q?=E6=95=B4=E6=80=A7=E6=A0=A1=E9=AA=8C=E7=BC=93=E5=AD=98=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/UdiRlSupController.java | 1 + .../inout/IoCodeLostController.java | 90 +++ .../inout/IoCodeTempController.java | 32 +- .../glxp/api/dao/basic/UdiRelevanceDao.java | 2 +- .../glxp/api/dao/inout/IoCodeLostMapper.java | 9 + .../glxp/api/dao/inout/IoCodeRelMapper.java | 9 + .../api/entity/inout/IoCodeLostEntity.java | 94 +++ .../api/entity/inout/IoCodeRelEntity.java | 108 +++ .../basic/BasicBackUpdateProductService.java | 2 + .../basic/BasicUpdateProductService.java | 2 + .../api/service/basic/UdiContrastService.java | 4 +- .../service/basic/UdiRelevanceService.java | 2 +- .../basic/impl/UdiRelevanceServiceImpl.java | 7 +- .../api/service/inout/IoAddInoutService.java | 6 + .../api/service/inout/IoCodeLostService.java | 15 + .../api/service/inout/IoCodeRelService.java | 9 + .../inout/impl/IoCodeLostServiceImpl.java | 39 + .../inout/impl/IoCodeRelServiceImpl.java | 9 + .../mybatis/mapper/basic/UdiRelevanceDao.xml | 724 +++++++++--------- .../mybatis/mapper/basic/UdiRlSupDao.xml | 4 +- .../mybatis/mapper/inout/IoCodeLostMapper.xml | 4 + .../mybatis/mapper/inout/IoCodeRelMapper.xml | 4 + .../mybatis/mapper/inv/invProductDao.xml | 1 - 23 files changed, 799 insertions(+), 378 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java create mode 100644 src/main/java/com/glxp/api/dao/inout/IoCodeLostMapper.java create mode 100644 src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java create mode 100644 src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java create mode 100644 src/main/java/com/glxp/api/entity/inout/IoCodeRelEntity.java create mode 100644 src/main/java/com/glxp/api/service/inout/IoCodeLostService.java create mode 100644 src/main/java/com/glxp/api/service/inout/IoCodeRelService.java create mode 100644 src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java create mode 100644 src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java create mode 100644 src/main/resources/mybatis/mapper/inout/IoCodeLostMapper.xml create mode 100644 src/main/resources/mybatis/mapper/inout/IoCodeRelMapper.xml diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index b00266c81..ba32e061a 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -66,6 +66,7 @@ public class UdiRlSupController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + companyProductRelevanceRequest.setIsDisable(false); if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getUdiCode())) { UdiEntity udiEntity = FilterUdiUtils.getUdi(companyProductRelevanceRequest.getUdiCode()); if (udiEntity != null) { diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java new file mode 100644 index 000000000..dc95649bf --- /dev/null +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java @@ -0,0 +1,90 @@ +package com.glxp.api.controller.inout; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.glxp.api.annotation.AuthRuleAnnotation; +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.controller.BaseController; +import com.glxp.api.entity.inout.IoCodeLostEntity; +import com.glxp.api.entity.inout.IoCodeTempEntity; +import com.glxp.api.req.inout.FilterOrderDetailResultRequest; +import com.glxp.api.res.inout.AcceptOrderResponse; +import com.glxp.api.res.inout.IoOrderDetailResultResponse; +import com.glxp.api.service.inout.IoCodeLostService; +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 javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +@RestController +public class IoCodeLostController extends BaseController { + + + @Resource + IoCodeLostService codeLostService; + + @AuthRuleAnnotation("") + @PostMapping("warehouse/inout/saveTabCode") + public BaseResponse saveCode(@RequestBody IoCodeTempEntity codeTempEntity) { + + if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo()) && codeTempEntity.getSerialNo().length() > 20) { + return ResultVOUtils.error(500, "无效条码！序列号超出最大范围，不予缓存"); + } + + if (StrUtil.isNotEmpty(codeTempEntity.getBatchNo()) && codeTempEntity.getBatchNo().length() > 20) { + return ResultVOUtils.error(500, "无效条码！批次号超出最大范围，不予缓存"); + } + + if (StrUtil.isBlank(codeTempEntity.getSerialNo()) && StrUtil.isBlank(codeTempEntity.getBatchNo())) { + return ResultVOUtils.error(500, "批次号不能为空！，不予缓存"); + } + if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) { + return ResultVOUtils.error(500, "有序列号不予缓存"); + } + + IoCodeLostEntity codeLostEntity = codeLostService.findByCode(codeTempEntity.getCode()); + IoCodeLostEntity insertEntity = null; + if (codeLostEntity == null) { + insertEntity = new IoCodeLostEntity(); + insertEntity.setCreateTime(new Date()); + } else { + insertEntity = codeLostEntity; + } + insertEntity.setCode(codeTempEntity.getCode()); + insertEntity.setBatchNo(codeTempEntity.getBatchNo()); + insertEntity.setProduceDate(codeTempEntity.getProduceDate()); + insertEntity.setExpireDate(codeTempEntity.getExpireDate()); + insertEntity.setSerialNo(codeTempEntity.getSerialNo()); + insertEntity.setSupId(codeTempEntity.getSupId()); + insertEntity.setUpdateTime(new Date()); + + if (codeLostEntity != null) { + codeLostService.update(insertEntity); + } else { + codeLostService.insert(insertEntity); + } + return ResultVOUtils.success("修改成功！"); + } + + + //获取验收单据业务详情 + @AuthRuleAnnotation("") + @GetMapping("/warehouse/inout/getTabCode") + public BaseResponse getTabCode(String code) { + if (StrUtil.isBlank(code)) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code); + if (codeLostEntity == null) + return ResultVOUtils.error(500, "未缓存！"); + return ResultVOUtils.success(codeLostEntity); + + } +} 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 94e2671b3..ef0b8b306 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -16,10 +16,7 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; -import com.glxp.api.entity.inout.IoCodeEntity; -import com.glxp.api.entity.inout.IoCodeTempEntity; -import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; -import com.glxp.api.entity.inout.IoOrderEntity; +import com.glxp.api.entity.inout.*; import com.glxp.api.entity.inv.InvPreinDetailEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.http.SpsDirectClient; @@ -93,7 +90,7 @@ public class IoCodeTempController extends BaseController { @Resource InvProductDetailService invProductDetailService; @Resource - DeptService deptService; + IoCodeLostService codeLostService; //手持端扫码单据上传调用接口 @AuthRuleAnnotation("") @@ -388,14 +385,21 @@ public class IoCodeTempController extends BaseController { BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity); if (checkOriginCodeRes != null) { - if (StrUtil.isNotEmpty(orderId)) { - List ioCodeEnttities = codeTempService.findByOrderId(orderId); - IoCodeTempEntity ioCodeEnttity = isExitLocal(code, ioCodeEnttities); - if (ioCodeEnttity == null) { + IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code); + if (codeLostEntity == null) { + if (StrUtil.isNotEmpty(orderId)) { + List ioCodeEnttities = codeTempService.findByOrderId(orderId); + IoCodeTempEntity ioCodeEnttity = isExitLocal(code, ioCodeEnttities); + if (ioCodeEnttity == null) { + return checkOriginCodeRes; + } + } else return checkOriginCodeRes; - } - } else - return checkOriginCodeRes; + } else { + udiEntity.setBatchNo(codeLostEntity.getBatchNo()); + udiEntity.setExpireDate(codeLostEntity.getExpireDate()); + udiEntity.setProduceDate(codeLostEntity.getProduceDate()); + } } } @@ -506,7 +510,7 @@ public class IoCodeTempController extends BaseController { if (StrUtil.isEmpty(exitLocalEntity.getSupId()) || exitLocalEntity.getRelId() == null) { return ResultVOUtils.error(500, "当前UDI码已存在，且存在异常未处理！"); } - udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(exitLocalEntity.getNameCode()); + udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(exitLocalEntity.getNameCode(), null); BeanUtils.copyProperties(exitLocalEntity, genDetaiEntity); genDetaiEntity.setCount(1); genDetaiEntity.setReCount(udiCalCountUtil.getActCount(udiRelevanceResponses.get(0))); @@ -558,7 +562,7 @@ public class IoCodeTempController extends BaseController { unitFk = addOrderRequest.getFromCorp(); } //产品是否可以以使用单元入库 - udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(codeEnttity.getNameCode()); + udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(codeEnttity.getNameCode(), false); if (udiRelevanceResponses.size() == 1) { UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0); if (udiRelevanceResponse == null) { diff --git a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java index a8db034ea..3efde2655 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java @@ -76,7 +76,7 @@ public interface UdiRelevanceDao extends BaseMapperPlus selectGroupByNameCode(@Param("nameCode") String nameCode); + List selectGroupByNameCode(@Param("nameCode") String nameCode, @Param("isDisable") Boolean isDisable); /** * 根据耗材字典ID查询产品名称 diff --git a/src/main/java/com/glxp/api/dao/inout/IoCodeLostMapper.java b/src/main/java/com/glxp/api/dao/inout/IoCodeLostMapper.java new file mode 100644 index 000000000..f94c51cb1 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/inout/IoCodeLostMapper.java @@ -0,0 +1,9 @@ +package com.glxp.api.dao.inout; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.inout.IoCodeLostEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface IoCodeLostMapper extends BaseMapper { +} diff --git a/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java b/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java new file mode 100644 index 000000000..8a585be24 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java @@ -0,0 +1,9 @@ +package com.glxp.api.dao.inout; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.inout.IoCodeRelEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface IoCodeRelMapper extends BaseMapper { +} diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java new file mode 100644 index 000000000..964590fbb --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java @@ -0,0 +1,94 @@ +package com.glxp.api.entity.inout; + +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.util.Date; + +import lombok.Data; + +/** + * 扫码缺失字段信息补齐表 + */ +@Data +@TableName(value = "io_code_lost") +public class IoCodeLostEntity { + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * UDI码 + */ + @TableField(value = "code") + private String code; + + /** + * 批次号 + */ + @TableField(value = "batchNo") + private String batchNo; + + /** + * 生产日期 + */ + @TableField(value = "produceDate") + private String produceDate; + + /** + * 失效日期 + */ + @TableField(value = "expireDate") + private String expireDate; + + /** + * 序列号 + */ + @TableField(value = "serialNo") + private String serialNo; + + /** + * 供应商 + */ + @TableField(value = "supId") + private String supId; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + public static final String COL_ID = "id"; + + public static final String COL_CODE = "code"; + + public static final String COL_BATCHNO = "batchNo"; + + public static final String COL_PRODUCEDATE = "produceDate"; + + public static final String COL_EXPIREDATE = "expireDate"; + + public static final String COL_SERIALNO = "serialNo"; + + public static final String COL_SUPID = "supId"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_REMARK = "remark"; +} diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeRelEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeRelEntity.java new file mode 100644 index 000000000..c28402c87 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeRelEntity.java @@ -0,0 +1,108 @@ +package com.glxp.api.entity.inout; + +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.util.Date; +import lombok.Data; + +/** + * 多级包装关联关系表 + */ +@Data +@TableName(value = "io_code_rel") +public class IoCodeRelEntity { + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * UDI码 + */ + @TableField(value = "code") + private String code; + + /** + * 父码 + */ + @TableField(value = "parentCode") + private String parentCode; + + /** + * DI产品标识 + */ + @TableField(value = "nameCode") + private String nameCode; + + /** + * DI类型 + */ + @TableField(value = "diType") + private Byte diType; + + /** + * 主产品DI标识 + */ + @TableField(value = "mainNameCode") + private String mainNameCode; + + /** + * 级别 + */ + @TableField(value = "`level`") + private String level; + + /** + * 生产日期 + */ + @TableField(value = "produceDate") + private String produceDate; + + /** + * 失效日期 + */ + @TableField(value = "expireDate") + private String expireDate; + + /** + * 序列号 + */ + @TableField(value = "serialNo") + private String serialNo; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + public static final String COL_ID = "id"; + + public static final String COL_CODE = "code"; + + public static final String COL_PARENTCODE = "parentCode"; + + public static final String COL_NAMECODE = "nameCode"; + + public static final String COL_DITYPE = "diType"; + + public static final String COL_MAINNAMECODE = "mainNameCode"; + + public static final String COL_LEVEL = "level"; + + public static final String COL_PRODUCEDATE = "produceDate"; + + public static final String COL_EXPIREDATE = "expireDate"; + + public static final String COL_SERIALNO = "serialNo"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATETIME = "updateTime"; +} diff --git a/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java b/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java index 8639146bc..cbf58134e 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java @@ -122,6 +122,7 @@ public class BasicBackUpdateProductService { String time = DateUtil.getDateTime(); udiRelevanceEntity1.setUpdateTime(new Date()); udiRelevanceEntity.setModifyTime(new Date()); + udiRelevanceEntity.setIsDisable(false); udiRelevanceEntity1.setId(gennerOrderUtils.getRelId()); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1); } @@ -208,6 +209,7 @@ public class BasicBackUpdateProductService { udiProductService.insertUdiInfo(udiProductEntity); UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); udiRelevanceEntity1.setUuid(udiProductEntity.getUuid()); + udiRelevanceEntity1.setIsDisable(false); udiRelevanceEntity1.setSupName(thrProductsEntity.getSupName()); if ("thirdId".equals(thirdSysId)) { diff --git a/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java b/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java index c2846be84..773aaf062 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java @@ -93,6 +93,7 @@ public class BasicUpdateProductService { udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId4()); } udiRelevanceEntity1.setId(gennerOrderUtils.getRelId()); + udiRelevanceEntity1.setIsDisable(false); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1); } } @@ -117,6 +118,7 @@ public class BasicUpdateProductService { udiRelevanceEntity.setUpdateTime(new Date()); udiRelevanceEntity.setModifyTime(new Date()); udiRelevanceEntity.setUuid(udiProductEntity.getUuid()); + udiRelevanceEntity.setIsDisable(false); List udiRelevanceEntities = udiRelevanceService.selectByUuid(udiProductEntity.getUuid()); if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 0) { boolean isAdd = false; diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index 65ccc4969..3992a4bea 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -145,6 +145,7 @@ public class UdiContrastService { udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); udiRelevanceEntity.setSupName(udiCombineRequest.getSupName()); udiRelevanceEntity.setId(gennerOrderUtils.getRelId()); + udiRelevanceEntity.setIsDisable(false); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); insertUdiInfos(udiInfoEntities); } @@ -157,12 +158,12 @@ public class UdiContrastService { UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setThirdId(thrProductsEntity.getCode()); udiRelevanceEntity.setMainId(thrProductsEntity.getCode()); - String time = DateUtil.getDateTime(); udiRelevanceEntity.setUpdateTime(new Date()); udiRelevanceEntity.setModifyTime(new Date()); udiRelevanceEntity.setUuid(CustomUtil.getUUId()); udiRelevanceEntity.setSupName(thrProductsEntity.getSupName()); udiRelevanceEntity.setId(gennerOrderUtils.getRelId()); + udiRelevanceEntity.setIsDisable(false); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); UdiProductEntity udiProductEntity = new UdiProductEntity(); BeanUtils.copyProperties(thrProductsEntity, udiProductEntity); @@ -195,6 +196,7 @@ public class UdiContrastService { } Long relId = gennerOrderUtils.getRelId(); udiRelevanceEntity.setId(relId); + udiRelevanceEntity.setIsDisable(false); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); insertUdiInfos(udiInfoEntities); return relId; 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 889657cb8..82022016e 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java @@ -79,5 +79,5 @@ public interface UdiRelevanceService { String findUuidById(String relId); - List selectGroupByNameCode(String nameCode); + List selectGroupByNameCode(String nameCode, Boolean isDisable); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java index 379ae31ef..d3817392e 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java @@ -86,9 +86,10 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); filterUdiRelRequest.setUniqueNameCode(nameCode); filterUdiRelRequest.setUnitFk(unitFk); + filterUdiRelRequest.setIsDisable(false); udiRelevanceResponses = filterUdiJoinSup(filterUdiRelRequest); } else { - udiRelevanceResponses = selectGroupByNameCode(nameCode); + udiRelevanceResponses = selectGroupByNameCode(nameCode, false); } if (udiRelevanceResponses.size() == 1) { UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0); @@ -339,7 +340,7 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { } @Override - public List selectGroupByNameCode(String nameCode) { - return udiRelevanceDao.selectGroupByNameCode(nameCode); + public List selectGroupByNameCode(String nameCode, Boolean isDisable) { + return udiRelevanceDao.selectGroupByNameCode(nameCode, isDisable); } } 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 ef5664987..27fafdc58 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -424,6 +424,9 @@ public class IoAddInoutService { } codeTempService.insertBatch(ioCodeEnttities); dealProcess(orderEntity); + if (!ioCheckInoutService.checkManual(orderEntity.getBillNo())) { + ioCheckInoutService.check(orderEntity.getBillNo()); + } } } else { //创建新单据 @@ -475,6 +478,9 @@ public class IoAddInoutService { } orderService.insertOrder(orderSaveRequest); dealProcess(orderSaveRequest); + if (!ioCheckInoutService.checkManual(orderEntity.getBillNo())) { + ioCheckInoutService.check(orderEntity.getBillNo()); + } } diff --git a/src/main/java/com/glxp/api/service/inout/IoCodeLostService.java b/src/main/java/com/glxp/api/service/inout/IoCodeLostService.java new file mode 100644 index 000000000..66e8d5b57 --- /dev/null +++ b/src/main/java/com/glxp/api/service/inout/IoCodeLostService.java @@ -0,0 +1,15 @@ +package com.glxp.api.service.inout; + +import com.glxp.api.entity.inout.IoCodeLostEntity; + +public interface IoCodeLostService { + + IoCodeLostEntity findByCode(String code); + + int insert(IoCodeLostEntity ioCodeLostEntity); + + + int deleteByCode(String code); + + int update(IoCodeLostEntity ioCodeLostEntity); +} diff --git a/src/main/java/com/glxp/api/service/inout/IoCodeRelService.java b/src/main/java/com/glxp/api/service/inout/IoCodeRelService.java new file mode 100644 index 000000000..421ecf3e6 --- /dev/null +++ b/src/main/java/com/glxp/api/service/inout/IoCodeRelService.java @@ -0,0 +1,9 @@ +package com.glxp.api.service.inout; + +import com.glxp.api.entity.inout.IoCodeRelEntity; +import com.baomidou.mybatisplus.extension.service.IService; + +public interface IoCodeRelService { + + +} diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java new file mode 100644 index 000000000..ddf611c7d --- /dev/null +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java @@ -0,0 +1,39 @@ +package com.glxp.api.service.inout.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +import com.glxp.api.dao.inout.IoCodeLostMapper; +import com.glxp.api.entity.inout.IoCodeLostEntity; +import com.glxp.api.service.inout.IoCodeLostService; + +@Service +public class IoCodeLostServiceImpl implements IoCodeLostService { + + @Resource + IoCodeLostMapper codeLostEntityMapper; + + + @Override + public IoCodeLostEntity findByCode(String code) { + + return codeLostEntityMapper.selectOne(new QueryWrapper().eq("code", code)); + } + + @Override + public int insert(IoCodeLostEntity ioCodeLostEntity) { + return codeLostEntityMapper.insert(ioCodeLostEntity); + } + + @Override + public int deleteByCode(String code) { + return codeLostEntityMapper.delete(new QueryWrapper().eq("code", code)); + } + + @Override + public int update(IoCodeLostEntity ioCodeLostEntity) { + return codeLostEntityMapper.updateById(ioCodeLostEntity); + } +} diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java new file mode 100644 index 000000000..debdb843b --- /dev/null +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java @@ -0,0 +1,9 @@ +package com.glxp.api.service.inout.impl; + +import com.glxp.api.service.inout.IoCodeRelService; +import org.springframework.stereotype.Service; + +@Service +public class IoCodeRelServiceImpl implements IoCodeRelService { + +} diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 24f9d7071..24355c68a 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -5,60 +5,60 @@ select basic_udirel.*, - basic_products.originUuid, - basic_products.nameCode, - basic_products.deviceRecordKey, - basic_products.packRatio, - basic_products.packUnit, - basic_products.packLevel, - basic_products.bhxjsl, - basic_products.bhzxxsbzsl, - basic_products.zxxsbzbhsydysl, - basic_products.bhxjcpbm, - basic_products.bzcj, - basic_products.cpmctymc, - basic_products.cplb, - basic_products.flbm, - basic_products.ggxh, - basic_products.qxlb, - basic_products.tyshxydm, - basic_products.ylqxzcrbarmc, - basic_products.zczbhhzbapzbh, - basic_products.ylqxzcrbarywmc, - basic_products.sydycpbs, - basic_products.sjcpbm, - basic_products.versionNumber, - basic_products.diType, - basic_products.ybbm, - basic_products.sptm, - basic_products.manufactory, - basic_products.measname, - basic_products.productType, - basic_products.scbssfbhph, - basic_products.scbssfbhxlh, - basic_products.scbssfbhscrq, - basic_products.scbssfbhsxrq, - basic_products.cpms, - basic_products.allowNoBatch, - basic_products.allowNoExpire, - basic_products.allowNoProduct, - basic_products.spmc, - basic_products.cplx, - basic_products.hchzsb, - basic_products.cpdls, - basic_products.price, - basic_products.basicPrductRemak1, - basic_products.basicPrductRemak2, - basic_products.basicPrductRemak3, - basic_products.basicPrductRemak4, - basic_products.basicPrductRemak5, - basic_products.basicPrductRemak6, - basic_products.basicPrductRemak7, - basic_products.basicPrductRemak8, - company_product_relevance.unitFk, - basic_corp.name companyName + basic_products.originUuid, + basic_products.nameCode, + basic_products.deviceRecordKey, + basic_products.packRatio, + basic_products.packUnit, + basic_products.packLevel, + basic_products.bhxjsl, + basic_products.bhzxxsbzsl, + basic_products.zxxsbzbhsydysl, + basic_products.bhxjcpbm, + basic_products.bzcj, + basic_products.cpmctymc, + basic_products.cplb, + basic_products.flbm, + basic_products.ggxh, + basic_products.qxlb, + basic_products.tyshxydm, + basic_products.ylqxzcrbarmc, + basic_products.zczbhhzbapzbh, + basic_products.ylqxzcrbarywmc, + basic_products.sydycpbs, + basic_products.sjcpbm, + basic_products.versionNumber, + basic_products.diType, + basic_products.ybbm, + basic_products.sptm, + basic_products.manufactory, + basic_products.measname, + basic_products.productType, + basic_products.scbssfbhph, + basic_products.scbssfbhxlh, + basic_products.scbssfbhscrq, + basic_products.scbssfbhsxrq, + basic_products.cpms, + basic_products.allowNoBatch, + basic_products.allowNoExpire, + basic_products.allowNoProduct, + basic_products.spmc, + basic_products.cplx, + basic_products.hchzsb, + basic_products.cpdls, + basic_products.price, + basic_products.basicPrductRemak1, + basic_products.basicPrductRemak2, + basic_products.basicPrductRemak3, + basic_products.basicPrductRemak4, + basic_products.basicPrductRemak5, + basic_products.basicPrductRemak6, + basic_products.basicPrductRemak7, + basic_products.basicPrductRemak8, + company_product_relevance.unitFk, + basic_corp.name companyName FROM basic_udirel - inner JOIN basic_products - ON basic_products.uuid = basic_udirel.uuid - left join company_product_relevance - on basic_udirel.id = company_product_relevance.udiRlIdFk - left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId + inner JOIN basic_products + ON basic_products.uuid = basic_udirel.uuid + left join company_product_relevance + on basic_udirel.id = company_product_relevance.udiRlIdFk + left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') @@ -251,59 +251,59 @@ select basic_udirel.*, - basic_products.originUuid, - basic_products.nameCode, - basic_products.deviceRecordKey, - basic_products.packRatio, - basic_products.packUnit, - basic_products.packLevel, - basic_products.bhxjsl, - basic_products.bhzxxsbzsl, - basic_products.zxxsbzbhsydysl, - basic_products.bhxjcpbm, - basic_products.bzcj, - basic_products.cpmctymc, - basic_products.cplb, - basic_products.flbm, - basic_products.ggxh, - basic_products.qxlb, - basic_products.tyshxydm, - basic_products.ylqxzcrbarmc, - basic_products.zczbhhzbapzbh, - basic_products.ylqxzcrbarywmc, - basic_products.sydycpbs, - basic_products.sjcpbm, - basic_products.versionNumber, - basic_products.diType, - basic_products.ybbm, - basic_products.sptm, - basic_products.manufactory, - basic_products.measname, - basic_products.productType, - basic_products.scbssfbhph, - basic_products.scbssfbhxlh, - basic_products.scbssfbhscrq, - basic_products.scbssfbhsxrq, - basic_products.cpms, - basic_products.allowNoBatch, - basic_products.allowNoExpire, - basic_products.allowNoProduct, - basic_products.spmc, - basic_products.cplx, - basic_products.hchzsb, - basic_products.cpdls, - basic_products.price, - basic_products.basicPrductRemak1, - basic_products.basicPrductRemak2, - basic_products.basicPrductRemak3, - basic_products.basicPrductRemak4, - basic_products.basicPrductRemak5, - basic_products.basicPrductRemak6, - basic_products.basicPrductRemak7, - basic_products.basicPrductRemak8 + basic_products.originUuid, + basic_products.nameCode, + basic_products.deviceRecordKey, + basic_products.packRatio, + basic_products.packUnit, + basic_products.packLevel, + basic_products.bhxjsl, + basic_products.bhzxxsbzsl, + basic_products.zxxsbzbhsydysl, + basic_products.bhxjcpbm, + basic_products.bzcj, + basic_products.cpmctymc, + basic_products.cplb, + basic_products.flbm, + basic_products.ggxh, + basic_products.qxlb, + basic_products.tyshxydm, + basic_products.ylqxzcrbarmc, + basic_products.zczbhhzbapzbh, + basic_products.ylqxzcrbarywmc, + basic_products.sydycpbs, + basic_products.sjcpbm, + basic_products.versionNumber, + basic_products.diType, + basic_products.ybbm, + basic_products.sptm, + basic_products.manufactory, + basic_products.measname, + basic_products.productType, + basic_products.scbssfbhph, + basic_products.scbssfbhxlh, + basic_products.scbssfbhscrq, + basic_products.scbssfbhsxrq, + basic_products.cpms, + basic_products.allowNoBatch, + basic_products.allowNoExpire, + basic_products.allowNoProduct, + basic_products.spmc, + basic_products.cplx, + basic_products.hchzsb, + basic_products.cpdls, + basic_products.price, + basic_products.basicPrductRemak1, + basic_products.basicPrductRemak2, + basic_products.basicPrductRemak3, + basic_products.basicPrductRemak4, + basic_products.basicPrductRemak5, + basic_products.basicPrductRemak6, + basic_products.basicPrductRemak7, + basic_products.basicPrductRemak8 from basic_udirel - INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid + INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid AND basic_udirel.uuid = #{uuid} @@ -581,66 +581,70 @@ replace - INTO basic_udirel - (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, isLock, - lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, updateUser, - remark) + INTO basic_udirel + (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, + isLock, + lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, + updateUser, + remark) values (#{id}, - #{uuid}, - #{mainId}, - #{thirdId}, - #{thirdId1}, - #{thirdId2}, - #{thirdId3}, - #{thirdId4}, - #{udplatCode}, - #{isUseDy}, - #{isDisable}, - #{isLock}, - #{lockStatus}, - #{isAdavence}, - #{useMuti}, - #{useNum}, - #{supName}, - #{createTime}, - #{updateTime}, - #{modifyTime}, - #{createUser}, - #{updateUser}, - #{remark}) + #{uuid}, + #{mainId}, + #{thirdId}, + #{thirdId1}, + #{thirdId2}, + #{thirdId3}, + #{thirdId4}, + #{udplatCode}, + #{isUseDy}, + #{isDisable}, + #{isLock}, + #{lockStatus}, + #{isAdavence}, + #{useMuti}, + #{useNum}, + #{supName}, + #{createTime}, + #{updateTime}, + #{modifyTime}, + #{createUser}, + #{updateUser}, + #{remark}) insert - ignore + ignore INTO basic_udirel - (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, isLock, - lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, updateUser, - remark) + (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, + isLock, + lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, + updateUser, + remark) values (#{id}, - #{uuid}, - #{mainId}, - #{thirdId}, - #{thirdId1}, - #{thirdId2}, - #{thirdId3}, - #{thirdId4}, - #{udplatCode}, - #{isUseDy}, - #{isDisable}, - #{isLock}, - #{lockStatus}, - #{isAdavence}, - #{useMuti}, - #{useNum}, - #{supName}, - #{createTime}, - #{updateTime}, - #{modifyTime}, - #{createUser}, - #{updateUser}, - #{remark}) + #{uuid}, + #{mainId}, + #{thirdId}, + #{thirdId1}, + #{thirdId2}, + #{thirdId3}, + #{thirdId4}, + #{udplatCode}, + #{isUseDy}, + #{isDisable}, + #{isLock}, + #{lockStatus}, + #{isAdavence}, + #{useMuti}, + #{useNum}, + #{supName}, + #{createTime}, + #{updateTime}, + #{modifyTime}, + #{createUser}, + #{updateUser}, + #{remark}) @@ -754,103 +758,113 @@ replace - into basic_udirel - (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, isLock, - lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, updateUser, - remark) - values + into basic_udirel + (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, + isLock, + lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, + updateUser, + remark) + values (#{item.id}, - #{item.uuid}, - #{item.mainId}, - #{item.thirdId}, - #{item.thirdId1}, - #{item.thirdId2}, - #{item.thirdId3}, - #{item.thirdId4}, - #{item.udplatCode}, - #{item.isUseDy}, - #{item.isDisable}, - #{item.isLock}, - #{item.lockStatus}, - #{item.isAdavence}, - #{item.useMuti}, - #{item.useNum}, - #{item.supName}, - #{item.createTime}, - #{item.updateTime}, - #{item.modifyTime}, - #{item.createUser}, - #{item.updateUser}, - # {item.remark}) + #{item.uuid}, + #{item.mainId}, + #{item.thirdId}, + #{item.thirdId1}, + #{item.thirdId2}, + #{item.thirdId3}, + #{item.thirdId4}, + #{item.udplatCode}, + #{item.isUseDy}, + #{item.isDisable}, + #{item.isLock}, + #{item.lockStatus}, + #{item.isAdavence}, + #{item.useMuti}, + #{item.useNum}, + #{item.supName}, + #{item.createTime}, + #{item.updateTime}, + #{item.modifyTime}, + #{item.createUser}, + #{item.updateUser}, + # {item.remark}) diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml index d4a62c9d7..8d6ffbe49 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml @@ -19,7 +19,7 @@ = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') + and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> @@ -340,4 +340,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/inout/IoCodeLostMapper.xml b/src/main/resources/mybatis/mapper/inout/IoCodeLostMapper.xml new file mode 100644 index 000000000..71ff7cf1f --- /dev/null +++ b/src/main/resources/mybatis/mapper/inout/IoCodeLostMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/resources/mybatis/mapper/inout/IoCodeRelMapper.xml b/src/main/resources/mybatis/mapper/inout/IoCodeRelMapper.xml new file mode 100644 index 000000000..f4970eb46 --- /dev/null +++ b/src/main/resources/mybatis/mapper/inout/IoCodeRelMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml index 5e14f5c5a..8de26c802 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml @@ -79,7 +79,6 @@ - group by ip.relIdFk, ip.batchNo order by ip.updateTime desc