UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3/6 basic 优化1.0

Browse Source
dev_2.5_ocean
wangwei 4 months ago
parent fe9b1da02a
commit 3fbd6d6469
16 changed files with 20 additions and 222 deletions
Show Stats Download Patch File Download Diff File

1
src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java
Unescape Escape View File

@ -42,6 +42,5 @@ public interface BasicBusTypePreDao extends BaseMapperPlus<BasicBusTypePreDao, B
*/
List<BasicBusTypePreResponse> selectBusTypePreResList(FilterBusTypePreRequest filterBusTypePreRequest);
boolean insertOrUpdateEntity(BasicBusTypePreEntity record);
}

2
src/main/java/com/glxp/api/dao/basic/BasicManufacturerMapper.java
Unescape Escape View File

@ -16,8 +16,6 @@ public interface BasicManufacturerMapper extends BaseMapperPlus<BasicManufacture
List<BasicManufacturerEntity> filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest);
List<BasicManufacturerEntity> batchSelectByErpIdsAndName(@Param("erpIds") List<String> erpIds, @Param("name") String name);
/**
* 根据往来单位名称和社会信用号查询列表
*

3
src/main/java/com/glxp/api/dao/basic/BasicProductSetDao.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.dao.basic;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.basic.BasicProductSetEntity;
import com.glxp.api.req.basic.FilterBasicProductSetrequest;
import org.apache.ibatis.annotations.Mapper;
@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface BasicProductSetDao {
public interface BasicProductSetDao extends BaseMapperPlus<BasicProductSetDao,BasicProductSetEntity,BasicProductSetEntity> {
List<BasicProductSetEntity> filterSetup(FilterBasicProductSetrequest filterBasicProductSetrequest);

3
src/main/java/com/glxp/api/dao/basic/BasicSkPrescirbeDetailMapper.java
Unescape Escape View File

@ -1,9 +1,10 @@
package com.glxp.api.dao.basic;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface BasicSkPrescirbeDetailMapper extends BaseMapper<BasicSkPrescribeItemEntity> {
public interface BasicSkPrescirbeDetailMapper extends BaseMapperPlus<BasicSkPrescirbeDetailMapper,BasicSkPrescribeItemEntity,BasicSkPrescribeItemEntity> {
}

9
src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java
Unescape Escape View File

@ -16,17 +16,8 @@ public interface CompanyProductRelevanceDao extends BaseMapperPlus<CompanyProduc
boolean insertCompanyProductRelevance(CompanyProductRelevanceEntity companyCertEntity);
boolean importCompanyProductRelevance(CompanyProductRelevanceEntity companyProductRelevanceEntity);
boolean deleteById(String id);
boolean deleteByRlId(String id);
/**
* 根据产品ID查询供应商ID
*
* @param udiRlIdFk
* @return
*/
List<String> selectUnitFkByUdiRlIdFk(@Param("udiRlIdFk") String udiRlIdFk);
}

5
src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.dao.basic;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.basic.ProductInfoEntity;
import com.glxp.api.util.page.ListPageRequest;
import com.glxp.api.req.basic.ProductInfoFilterRequest;
@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface ProductInfoDao {
public interface ProductInfoDao extends BaseMapperPlus<ProductInfoDao,ProductInfoEntity,ProductInfoEntity> {
List<ProductInfoEntity> filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest);
@ -37,7 +38,6 @@ public interface ProductInfoDao {
boolean updateProductByUuid(ProductInfoEntity productInfoEntity);
List<String> findAllUuids(ListPageRequest listPageRequest);
List<ProductInfoEntity> selectByUuid(@Param("uuid") String uuid);
@ -55,6 +55,5 @@ public interface ProductInfoDao {
List<ProductInfoEntity> selectAllByUuid(@Param("ids") List<String> ids);
List<String> findAllTyshxyh();
}

8
src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java
Unescape Escape View File

@ -30,7 +30,6 @@ public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRele
List<UdiRelevanceResponse> filterUdiGpexist(FilterUdiRelRequest filterUdiRelRequest);
// UdiRelevanceResponse selectUdiByUUid
List<UdiRelevanceEntity> selectByUuid(@Param("uuid") String uuid);
@ -67,13 +66,6 @@ public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRele
List<UdiRelevanceEntity> batchSelectByIds(@Param("ids") List<String> ids);
/**
* 批量导入数据
*
* @param udiRelevanceEntities
*/
void importUdiRelevance(@Param("udiRelevanceEntities") List<UdiRelevanceEntity> udiRelevanceEntities);
/**
* /**
* 查找产品UUID

7
src/main/java/com/glxp/api/dao/basic/UdiRlSupDao.java
Unescape Escape View File

@ -37,13 +37,6 @@ public interface UdiRlSupDao extends BaseMapperPlus<UdiRlSupDao, CompanyProductR
boolean deleteByRlId(String id);
/**
* 根据耗材ID查询供应商ID列表
*
* @param relId
* @return
*/
List<String> selectUnitFkByRelId(@Param("relId") Long relId);
/**
* 统计供应商配送产品数量

85
src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml
Unescape Escape View File

@ -69,89 +69,4 @@
</where>
</select>
<insert id="insertOrUpdateEntity" keyColumn="id" keyProperty="id"
parameterType="com.glxp.api.entity.basic.BasicBusTypePreEntity" useGeneratedKeys="true">
insert into basic_bustype_pre
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
intro,
`action`,
`index`,
beforeTime,
changeType,
defaultDeptCode,
defaultInvCode,
deptCode,
invCode,
originAction,
changeEnable,
supplementAll,
`createUser`,
updateUser,
createTime,
updateTime,
remark,
targetBusAction,
busBeforeTime,
auditStatus,
busAuditStatus, createType,
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
#{intro,jdbcType=VARCHAR},
#{action,jdbcType=VARCHAR},
#{index,jdbcType=TINYINT},
#{beforeTime,jdbcType=INTEGER},
#{changeType,jdbcType=TINYINT},
#{defaultDeptCode,jdbcType=VARCHAR},
#{defaultInvCode,jdbcType=VARCHAR},
#{deptCode,jdbcType=VARCHAR},
#{invCode,jdbcType=VARCHAR},
#{originAction,jdbcType=VARCHAR},
#{changeEnable,jdbcType=TINYINT},
#{supplementAll,jdbcType=TINYINT},
#{createUser,jdbcType=VARCHAR},
#{updateUser,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP},
#{remark,jdbcType=VARCHAR},
#{targetBusAction,jdbcType=VARCHAR},
#{busBeforeTime,jdbcType=TINYINT},
#{auditStatus,jdbcType=TINYINT},
#{busAuditStatus,jdbcType=TINYINT}, #{createType,jdbcType=TINYINT},
</trim>
on duplicate key update
<trim suffixOverrides=",">
<if test="id != null">
id = #{id,jdbcType=INTEGER},
</if>
intro = #{intro,jdbcType=VARCHAR},
`action` = #{action,jdbcType=VARCHAR},
`index` = #{index,jdbcType=TINYINT},
beforeTime = #{beforeTime,jdbcType=INTEGER},
changeType = #{changeType,jdbcType=TINYINT},
defaultDeptCode = #{defaultDeptCode,jdbcType=VARCHAR},
defaultInvCode = #{defaultInvCode,jdbcType=VARCHAR},
deptCode = #{deptCode,jdbcType=VARCHAR},
invCode = #{invCode,jdbcType=VARCHAR},
originAction = #{originAction,jdbcType=VARCHAR},
changeEnable = #{changeEnable,jdbcType=TINYINT},
supplementAll = #{supplementAll,jdbcType=TINYINT},
`createUser` = #{createUser,jdbcType=VARCHAR},
updateUser = #{updateUser,jdbcType=VARCHAR},
createTime = #{createTime,jdbcType=TIMESTAMP},
updateTime = #{updateTime,jdbcType=TIMESTAMP},
remark = #{remark,jdbcType=VARCHAR},
targetBusAction = #{targetBusAction,jdbcType=VARCHAR},
busBeforeTime = #{busBeforeTime,jdbcType=TINYINT},
auditStatus = #{auditStatus,jdbcType=TINYINT},
busAuditStatus = #{busAuditStatus,jdbcType=TINYINT},
createType = #{createType,jdbcType=TINYINT},
</trim>
</insert>
</mapper>

15
src/main/resources/mybatis/mapper/basic/BasicManufacturerMapper.xml
Unescape Escape View File

@ -36,21 +36,6 @@
</select>
<select id="batchSelectByErpIdsAndName" resultType="com.glxp.api.entity.basic.BasicManufacturerEntity">
select *
from basic_manufacturer
<where>
<if test="name != null and name != ''">
AND name like concat('%', #{name}, '%')
</if>
<if test="erpIds != null and erpIds.size() != 0">
AND erpId in
<foreach collection="erpIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</if>
</where>
</select>
<select id="selectByNameAndCreditNo" resultType="com.glxp.api.entity.basic.BasicManufacturerEntity">
select *

7
src/main/resources/mybatis/mapper/basic/BasicProductsDao.xml
Unescape Escape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.basic.BasicProductsDao">
</mapper>

7
src/main/resources/mybatis/mapper/basic/BasicSkPrescirbeDetailMapper.xml
Unescape Escape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.basic.BasicSkPrescirbeDetailMapper">
</mapper>

24
src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml
Unescape Escape View File

@ -21,24 +21,6 @@
</insert>
<insert id="importCompanyProductRelevance"
parameterType="com.glxp.api.entity.basic.CompanyProductRelevanceEntity">
replace
INTO company_product_relevance(id, customerId, productId, enterpriseId, registrationId,
createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk,
price)
values (#{id},
#{customerId},
#{productId},
#{enterpriseId},
#{registrationId},
#{createTime},
#{updateTime},
#{auditStatus},
#{productUuid},
#{udiRlIdFk},
#{unitFk}, #{price})
</insert>
<delete id="deleteById" parameterType="Map">
DELETE
@ -227,10 +209,4 @@
</select>
<select id="selectUnitFkByUdiRlIdFk" resultType="java.lang.String">
select unitFk
from company_product_relevance
where udiRlIdFk = #{udiRlIdFk}
group by unitFk
</select>
</mapper>

13
src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml
Unescape Escape View File

@ -742,17 +742,4 @@
WHERE uuid = #{uuid}
</update>
<!--测试专用-->
<select id="findAllUuids" parameterType="com.glxp.api.util.page.ListPageRequest" resultType="java.lang.String">
SELECT uuid
from device
group by uuid
limit #{page}, #{limit}
</select>
<select id="findAllTyshxyh" resultType="java.lang.String">
SELECT tyshxydm
from productinfo
group by tyshxydm
</select>
</mapper>

41
src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -1608,47 +1608,6 @@
</foreach>
</select>
<insert id="importUdiRelevance" parameterType="java.util.List">
replace
into basic_udirel
(id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
isLock,
lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime,
updateTime,
modifyTime,
createUser,
updateUser,
remark, useExpireTime, dispatch, groupBuy, needCert, isStack)
values
<foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
(#{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.purType}, #{item.attributeType}, #{item.hcType},
#{item.useMuti},
#{item.useNum},
#{item.supName},
#{item.createTime},
#{item.updateTime},
#{item.modifyTime},
#{item.createUser},
#{item.updateUser},
#{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}, #{item.needCert},
#{item.isStack})
</foreach>
</insert>
<select id="selectGroupByNameCode" parameterType="java.lang.String"
resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
select basic_udirel.*,

12
src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
Unescape Escape View File

@ -425,18 +425,6 @@
WHERE udiRlIdFk = #{id}
</delete>
<select id="selectUnitFkByUdiRlIdFk" resultType="java.lang.String">
select unitFk
from company_product_relevance
where udiRlIdFk = #{udiRlIdFk}
</select>
<select id="selectUnitFkByRelId" resultType="java.lang.String">
select unitFk
from company_product_relevance
where udiRlIdFk = #{relId}
</select>
<select id="selectSupRlCount" resultType="java.lang.Long">
select count(*)
FROM company_product_relevance

Write Preview
Loading…
Cancel
Save