From 8a614fd0bccdd759e9eab8b3de349bddfb22b482 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 26 Jul 2024 10:03:24 +0800 Subject: [PATCH] 1.1 --- .../auth/SysWorkplaceController.java | 94 ++++++++++ .../basic/UdiContrastController.java | 8 + .../glxp/api/dao/auth/SysWorkplaceDao.java | 20 +++ .../glxp/api/entity/auth/SysWorkplace.java | 77 ++++++++ .../api/entity/basic/UdiProductEntity.java | 90 ++++++++++ .../api/entity/basic/UdiRelevanceEntity.java | 38 ++++ .../api/req/auth/SysWorkplaceRequest.java | 16 ++ .../glxp/api/req/basic/AddDrugRequest.java | 165 ++++++++++++++++++ .../glxp/api/req/basic/AddProductRequest.java | 105 ++++++++++- .../api/req/basic/FilterUdiRelRequest.java | 5 + .../api/res/basic/UdiRelevanceResponse.java | 17 ++ .../api/service/auth/SysWorkplaceService.java | 28 +++ .../mybatis/mapper/auth/SysWorkplaceDao.xml | 25 +++ .../mybatis/mapper/basic/UdiProductDao.xml | 15 +- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 15 +- .../mapper/purchase/PurApplyDetailDao.xml | 1 - 16 files changed, 715 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java create mode 100644 src/main/java/com/glxp/api/dao/auth/SysWorkplaceDao.java create mode 100644 src/main/java/com/glxp/api/entity/auth/SysWorkplace.java create mode 100644 src/main/java/com/glxp/api/req/auth/SysWorkplaceRequest.java create mode 100644 src/main/java/com/glxp/api/req/basic/AddDrugRequest.java create mode 100644 src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java create mode 100644 src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java new file mode 100644 index 000000000..9ac95574f --- /dev/null +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java @@ -0,0 +1,94 @@ +package com.glxp.api.controller.auth; + +import cn.hutool.core.util.IdUtil; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.auth.SysWorkplace; +import com.glxp.api.req.auth.SysWorkplaceRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.auth.SysWorkplaceService; +import lombok.extern.slf4j.Slf4j; +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; + +/** + * @author : zhuzhu + * @date : 2024/7/24 10:12 + * @modyified By : + */ +@Slf4j +@RestController +public class SysWorkplaceController extends BaseController { + + + @Resource + SysWorkplaceService sysWorkplaceService; + + + + @PostMapping("/udiwms/sysWorkplace/page") + public BaseResponse page(@RequestBody SysWorkplaceRequest request){ +// Page page = sysWorkplaceService.page(new Page<>(request.getPage(), request.getLimit()), Wrappers.lambdaQuery(SystemWorkplace.class) +// .eq(StrUtil.isNotBlank(request.getInvCode()),SystemWorkplace::getInvCode,request.getInvCode()) +// .like(StrUtil.isNotBlank(request.getKey()),SystemWorkplace::getWorkplaceId,request.getKey()) +// .or() +// .like(StrUtil.isNotBlank(request.getKey()),SystemWorkplace::getWorkplaceName,request.getKey()) +// ); + Page page = sysWorkplaceService.filterList(request); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse(); + pageSimpleResponse.setList(page.getRecords()); + pageSimpleResponse.setTotal(page.getTotal()); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/sysWorkplace/addWorkplace") + public BaseResponse addWorkplace(@RequestBody SysWorkplace sysWorkplace){ + sysWorkplace.setId(IdUtil.getSnowflakeNextId()); + sysWorkplace.setCreateTime(new Date()); + sysWorkplace.setUpdateTime(new Date()); + boolean save = sysWorkplaceService.save(sysWorkplace); + if (!save){ + return ResultVOUtils.error("新增错误"); + } + return ResultVOUtils.success("新增成功"); + } + + @PostMapping("/udiwms/sysWorkplace/updateWorkplace") + public BaseResponse updateWorkplace(@RequestBody SysWorkplace sysWorkplace){ + sysWorkplace.setUpdateTime(new Date()); + boolean save = sysWorkplaceService.updateById(sysWorkplace); + if (!save){ + return ResultVOUtils.error("更新错误"); + } + return ResultVOUtils.success("更新成功"); + } + + + @PostMapping("/udiwms/sysWorkplace/deleteWorkplace") + public BaseResponse deleteWorkplace(@RequestBody SysWorkplace sysWorkplace){ + boolean save = sysWorkplaceService.removeById(sysWorkplace); + if (!save){ + return ResultVOUtils.error("删除错误"); + } + return ResultVOUtils.success("删除成功"); + } + + @PostMapping("/udiwms/sysWorkplace/createWorkplaceId") + public BaseResponse createWorkplaceId(){ + Long workplaceId = sysWorkplaceService.maxWorkplaceId(); + if (workplaceId != null){ + workplaceId = workplaceId + 1; + } + return ResultVOUtils.success(workplaceId); + } + + + +} diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java index 43af463c2..1000e0fc4 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -316,6 +316,14 @@ public class UdiContrastController { } + @AuthRuleAnnotation("") + @PostMapping("/udi/udirel/addDrug") + public BaseResponse addDrug(@RequestBody AddProductRequest addProductRequest) { + udiProductService.addProduct(addProductRequest); + return ResultVOUtils.success(); + + } + public void updateDi(UdiRelevanceEntity udiRelevanceEntity, String key) { List udiInfoEntities = udiDlHttpClient.getOrUpdateByUuid(key); List originProductEntities = udiProductService.findByUuids(udiRelevanceEntity.getUuid()); diff --git a/src/main/java/com/glxp/api/dao/auth/SysWorkplaceDao.java b/src/main/java/com/glxp/api/dao/auth/SysWorkplaceDao.java new file mode 100644 index 000000000..83f41e57c --- /dev/null +++ b/src/main/java/com/glxp/api/dao/auth/SysWorkplaceDao.java @@ -0,0 +1,20 @@ +package com.glxp.api.dao.auth; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import com.glxp.api.entity.auth.SysWorkplace; +import com.glxp.api.req.auth.SysWorkplaceRequest; +import org.apache.ibatis.annotations.Param; + +/** + * @author : zhangsan + * @date : 2024/7/24 10:15 + * @modyified By : + */ + +public interface SysWorkplaceDao extends BaseMapper { + Long selectMaxWorkplaceId(); + + Page filterList(@Param("page") Page pageObject, @Param("request") SysWorkplaceRequest request); +} diff --git a/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java b/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java new file mode 100644 index 000000000..0a75f5fdf --- /dev/null +++ b/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java @@ -0,0 +1,77 @@ +package com.glxp.api.entity.auth; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.Size; +import java.io.Serializable; +import java.util.Date; + +/** +* +* @TableName system_workplace +*/ + +@Data +@TableName(value = "sys_workplace") +public class SysWorkplace implements Serializable { + + /** + * 工位编码 + */ + @TableField(value = "id") + private Long id; + + /** + * 工位编码 + */ + + @ApiModelProperty("工位编码") + @TableField(value = "workplaceId") + private Long workplaceId; + /** + * 工位名称 + */ + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("工位名称") + @Length(max= 255,message="编码长度不能超过255") + @TableField(value = "workplaceName") + private String workplaceName; + /** + * 所属仓库 + */ + @ApiModelProperty("所属仓库") + @TableField(value = "invCode") + private Integer invCode; + /** + * 备注 + */ + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("备注") + @Length(max= 255,message="编码长度不能超过255") + @TableField(value = "remake") + private String remake; + /** + * + */ + @ApiModelProperty("") + @TableField(value = "createTime") + private Date createTime; + /** + * + */ + @ApiModelProperty("") + @TableField(value = "updateTime") + private Date updateTime; + + + @TableField(exist = false) + private String invName; + + + + +} diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index 1181bef44..9842e301d 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -1,6 +1,7 @@ package com.glxp.api.entity.basic; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -141,4 +142,93 @@ public class UdiProductEntity { private Integer requireScanCode; + + + /** + * 产品类型 1:药品 2:耗材 + */ + @TableField(value = "productsType") + private Integer productsType; + + + /** + * 每个层级的单位（例如：箱，盒，支） + */ + @TableField(value = "levelUnit") + private String levelUnit; + + /** + * 制剂单位 + */ + @TableField(value = "prepnUnit") + private String prepnUnit; + + /** + * 包装材质 + */ + @TableField(value = "packMatrial") + private String packMatrial; + + /** + * 使用属性 + */ + @TableField(value = "useAttribute") + private String useAttribute; + + /** + * 运输条件 + */ + @TableField(value = "transportCondition") + private String transportCondition; + + /** + * 存储条件 + */ + @TableField(value = "storageCondition") + private String storageCondition; + + /** + * 特殊分类码 + */ + @TableField(value = "specialCode") + private String specialCode; + + + /** + * 使用属性 + */ + @TableField(value = "indate") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") + private Date indate; + + + /** + * 药品类型(详见码表) 1：特殊药品原料药，2：特殊药品制剂，3：普通药品，9：未分类 + */ + @TableField(value = "physicType") + private Integer physicType; + + /** + *制剂规格 + */ + @TableField(value = "prepnSpec") + private String prepnSpec; + + /** + * 药品分类 + */ + @TableField(value = "majorType") + private Integer majorType; + + + + /** + * 医保分类 1:甲类;2:乙类;3:丙类 + */ + @TableField(value = "medicareType") + private Integer medicareType; + + + private Integer majorStatus; + } 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 f9a34e4df..090765350 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -206,4 +206,42 @@ public class UdiRelevanceEntity { @TableField(value = "newNeedUpload") private Boolean newNeedUpload; + + + /** + * 流通计量层层级标识 + */ + @TableField(value = "distributeLevelDi") + private String distributeLevelDi; + + /** + * 流通计量层级单位 + */ + @TableField(value = "distributeLevelUnit") + private String distributeLevelUnit; + + /** + * 流通时包含计量单元的数量 + */ + @TableField(value = "distributeLevelCount") + private Integer distributeLevelCount; + + /** + * 使用计量层级标识 + */ + @TableField(value = "useLevelDi") + private String useLevelDi; + + /** + * 使用计量层级单位 + */ + @TableField(value = "useLevelUnit") + private String useLevelUnit; + + /** + * 使用是当前层级包含计量单元数量 + */ + @TableField(value = "useLeverCount") + private Integer useLeverCount; + } diff --git a/src/main/java/com/glxp/api/req/auth/SysWorkplaceRequest.java b/src/main/java/com/glxp/api/req/auth/SysWorkplaceRequest.java new file mode 100644 index 000000000..57ed69648 --- /dev/null +++ b/src/main/java/com/glxp/api/req/auth/SysWorkplaceRequest.java @@ -0,0 +1,16 @@ +package com.glxp.api.req.auth; + + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +/** + * @author : zhangsan + * @date : 2024/7/24 10:21 + * @modyified By : + */ +@Data +public class SysWorkplaceRequest extends ListPageRequest { + private String key; + private String invCode; +} diff --git a/src/main/java/com/glxp/api/req/basic/AddDrugRequest.java b/src/main/java/com/glxp/api/req/basic/AddDrugRequest.java new file mode 100644 index 000000000..5b99f7d59 --- /dev/null +++ b/src/main/java/com/glxp/api/req/basic/AddDrugRequest.java @@ -0,0 +1,165 @@ +package com.glxp.api.req.basic; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.Date; + +@NoArgsConstructor +@Data +public class AddDrugRequest { + + /** + * 产品名称 + */ + @JsonProperty("name") + @NotEmpty(message = "产品名称必填！") + private String name; + + + + /** + * 生产企业 + */ + @JsonProperty("manufactory") + @NotEmpty(message = "生产企业必填！") + private String manufactory; + + + + + /** + * 医疗器械注册人 + */ + @JsonProperty("ylqxzcrbarmc") + private String ylqxzcrbarmc; + + + + + + + + + + /** + * 医保编码 + */ + @JsonProperty("ybbm") + private String ybbm; + + /** + * 统一社会信用号 + */ + @JsonProperty("tyshxydm") + private String tyshxydm; + + + + /** + * 产品描述 + */ + @JsonProperty("cpms") + private String cpms; + + + + + private BigDecimal price; + + + + //商品名称 + private String spmc; + /** + * 包装单位 + */ + private String packUnit; + + /** + * 产品类型 1:药品 2:耗材 + */ + @TableField(value = "productsType") + private Integer productsType; + + + /** + * 每个层级的单位（例如：箱，盒，支） + */ + @TableField(value = "levelUnit") + private String levelUnit; + + /** + * 制剂单位 + */ + @TableField(value = "prepnUnit") + private String prepnUnit; + + /** + * 包装材质 + */ + @TableField(value = "packMatrial") + private String packMatrial; + + /** + * 使用属性 + */ + @TableField(value = "useAttribute") + private String useAttribute; + + /** + * 运输条件 + */ + @TableField(value = "transportCondition") + private String transportCondition; + + /** + * 存储条件 + */ + @TableField(value = "storageCondition") + private String storageCondition; + + /** + * 特殊分类码 + */ + @TableField(value = "specialCode") + private String specialCode; + + + /** + * 有效期 + */ + @TableField(value = "indate") + private Date indate; + + + /** + * 药品类型(详见码表) 1：特殊药品原料药，2：特殊药品制剂，3：普通药品，9：未分类 + */ + @TableField(value = "physicType") + private Integer physicType; + + + /** + *制剂规格 + */ + @TableField(value = "prepnSpec") + private String prepnSpec; + /** + * 药品分类 + */ + @TableField(value = "majorType") + private Integer majorType; + + /** + * 医保分类 1:甲类;2:乙类;3:丙类 + */ + @TableField(value = "medicareType") + private Integer medicareType; +} diff --git a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java index 15d47ded0..49aa957a1 100644 --- a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java +++ b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java @@ -1,6 +1,7 @@ package com.glxp.api.req.basic; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,6 +10,8 @@ import lombok.NoArgsConstructor; import javax.validation.Valid; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.Date; @NoArgsConstructor @Data @@ -145,9 +148,109 @@ public class AddProductRequest { @ApiModelProperty(value="耗材材质") private String matrial; - private String price; + private BigDecimal price; private Integer destinyType; private String code; private Integer requireScanCode; + + + //商品名称 + private String spmc; + /** + * 包装单位 + */ + private String packUnit; + + /** + * 产品类型 1:药品 2:耗材 + */ + @TableField(value = "productsType") + private Integer productsType; + + + /** + * 每个层级的单位（例如：箱，盒，支） + */ + @TableField(value = "levelUnit") + private String levelUnit; + + /** + * 制剂单位 + */ + @TableField(value = "prepnUnit") + private String prepnUnit; + + /** + * 包装材质 + */ + @TableField(value = "packMatrial") + private String packMatrial; + + /** + * 使用属性 + */ + @TableField(value = "useAttribute") + private String useAttribute; + + /** + * 运输条件 + */ + @TableField(value = "transportCondition") + private String transportCondition; + + /** + * 存储条件 + */ + @TableField(value = "storageCondition") + private String storageCondition; + + /** + * 特殊分类码 + */ + @TableField(value = "specialCode") + private String specialCode; + + + /** + * 有效期 + */ + @TableField(value = "indate") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") + private Date indate; + + + /** + * 药品类型(详见码表) 1：特殊药品原料药，2：特殊药品制剂，3：普通药品，9：未分类 + */ + @TableField(value = "physicType") + private Integer physicType; + + + /** + *制剂规格 + */ + @TableField(value = "prepnSpec") + private String prepnSpec; + /** + * 药品分类 + */ + @TableField(value = "majorType") + private Integer majorType; + + /** + * 医保分类 1:甲类;2:乙类;3:丙类 + */ + @TableField(value = "medicareType") + private Integer medicareType; + private Integer majorStatus; + + /** + * 批准文号 + */ + private String zczbhhzbapzbh; + /** + * 包装规格 + */ + private String bzgg; } 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 aade4731f..d61925479 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -114,5 +114,10 @@ public class FilterUdiRelRequest extends ListPageRequest { private String deviceRecordKey; + //药品参数 + private String productsType; + private String cpms; + + } 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 e0326fdae..4e72d1c6c 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -203,6 +203,23 @@ public class UdiRelevanceResponse { private Integer requireScanCode; + /** + * 制剂规格 + */ + private String prepnSpec; + + /** + * 制剂单位 + */ + private String prepnUnit; + + /** + * 制剂单位 + */ + private Integer majorStatus; + + + /** * 包装规格 */ diff --git a/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java b/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java new file mode 100644 index 000000000..df7eec43e --- /dev/null +++ b/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java @@ -0,0 +1,28 @@ +package com.glxp.api.service.auth; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import com.glxp.api.dao.auth.SysWorkplaceDao; +import com.glxp.api.entity.auth.SysWorkplace; +import com.glxp.api.req.auth.SysWorkplaceRequest; +import org.springframework.stereotype.Service; + +/** + * @author : zhangsan + * @date : 2024/7/24 10:13 + * @modyified By : + */ +@Service +public class SysWorkplaceService extends ServiceImpl { + + + public Long maxWorkplaceId() { + return super.baseMapper.selectMaxWorkplaceId(); + } + + public Page filterList(SysWorkplaceRequest request) { + Page page = super.baseMapper.filterList(request.getPageObj(), request); + return page; + } +} diff --git a/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml b/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml new file mode 100644 index 000000000..e82dbf820 --- /dev/null +++ b/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml @@ -0,0 +1,25 @@ + + + + + + + diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index 9a0be1941..5ca944a82 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -193,7 +193,8 @@ catalogname2, catalogname3, matrial, - destinyType, + destinyType, + productsType,prepnUnit,prepnSpec,storageCondition,transportCondition,indate,packMatrial,majorType,majorStatus,physicType,medicareType,bzgg, requireScanCode) values (#{id}, #{uuid}, #{originUuid}, @@ -256,6 +257,18 @@ #{catalogname3}, #{matrial}, #{destinyType}, + #{productsType}, + #{prepnUnit}, + #{prepnSpec}, + #{storageCondition}, + #{transportCondition}, + #{indate}, + #{packMatrial}, + #{majorType}, + #{majorStatus}, + #{physicType}, + #{medicareType}, + #{bzgg}, #{requireScanCode}) diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 5a7ed8d0c..e913d36d4 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -558,6 +558,10 @@ basic_products.catalogname2, basic_products.catalogname3, basic_products.matrial, + basic_products.prepnSpec, + basic_products.levelUnit, + basic_products.prepnUnit, + basic_products.majorStatus, basic_products.requireScanCode, th.hsmc hslbName FROM basic_products @@ -572,6 +576,9 @@ AND relCode = #{relCode} + + AND basic_products.productsType = #{productsType} + AND (relCode is null or trim(relCode) = '') @@ -620,7 +627,7 @@ AND udplatCode = #{udplatCode} - AND basic_products.zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%') + AND basic_products.zczbhhzbapzbh LIKE concat('%',#{zczbhhzbapzbh}, '%') AND diType = #{diType} @@ -671,6 +678,12 @@ and basic_products.manufactory LIKE concat('%', #{manufactory}, '%') + + AND basic_products.ybbm LIKE concat(#{ybbm}, '%') + + + AND basic_products.cpms LIKE concat(#{cpms}, '%') + and basic_udirel.dispatch = #{dispatch} diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml index 2eb8e3053..b43bccd1e 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml @@ -122,7 +122,6 @@ pur_apply.billNo, basic_products.ggxh spec, basic_products.nameCode, - basic_products.measname, basic_products.manufactory, basic_products.ylqxzcrbarmc, basic_corp.`name` supName