3/6 inv 优化1.0

dev_2.5_ocean
wangwei 4 months ago
parent dadd58dcad
commit c21443b22a

@ -45,38 +45,7 @@ public interface InvCountCodesMapper extends BaseMapperPlus<InvCountCodesMapper,
*/
Long countByOrderId(@Param("orderIdFk") String orderIdFk);
/**
*
*
* @param code
* @param orderIdFk
* @return
*/
Long selectCountByCodeAndOrderId(@Param("code") String code, @Param("orderIdFk") String orderIdFk);
/**
*
*
* @param orderId
*/
void resetCountFiledValue(@Param("orderId") String orderId);
/**
* ID
*
* @param orderIdFk
* @param productId
* @return
*/
List<InvCountCodesEntity> selectByOrderIdAndProductId(@Param("orderIdFk") String orderIdFk, @Param("productId") String productId);
/**
*
*
* @param codesRequest
* @return
*/
List<String> selectCodes(FilterInvCountCodesRequest codesRequest);
}

@ -77,11 +77,4 @@ public interface InvCountOrderDetailMapper extends BaseMapperPlus<InvCountOrderD
*/
void resetCountFiledValue(@Param("orderId") String orderId);
/**
*
*
* @param detailRequest
* @return
*/
List<InvCountOrderDetailEntity> selectDetailList(FilterInvCountOrderDetailRequest detailRequest);
}

@ -28,16 +28,6 @@ public interface InvCountOrderMapper extends BaseMapper<InvCountOrderEntity> {
*/
String selectOrderIdById(@Param("id") String id);
/**
*
*
* @param invStorageCode
* @param
* @param invSpaceCode
* @return
*/
Integer countBySpaceCode(@Param("invStorageCode") String invStorageCode, @Param("invSpaceCode") String invSpaceCode);
/**
*
*

@ -14,11 +14,5 @@ public interface InvCountSettingMapper extends BaseMapper<InvCountSettingEntity>
List<InvCountSettingResponse> filterList(FilterInvCountSettingRequest settingRequest);
/**
*
*
* @return
*/
Long countSetting();
}

@ -39,9 +39,6 @@ public interface InvPreInProductDetailDao extends BaseMapperPlus<InvPreInProduct
*/
boolean deleteInvPreProductDetail(FilterInvProductDetailRequest detailRequest);
List<InvPlaceDetailResponse> getInvProductInfo(FilterInvPlaceRequest filterInvPlaceRequest);
void batchBindSpace(@Param("ids") List<Integer> ids, @Param("invSpaceCode") String invSpaceCode);
List<IoOrderResponse> getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest);
@ -50,10 +47,8 @@ public interface InvPreInProductDetailDao extends BaseMapperPlus<InvPreInProduct
//用货架查询
List<InvPlaceDetailResponse> filterSpaceList(FilterInvPlaceRequest filterInvPlaceOrderRequest);
List<InvPlaceDetailResponse> findByGroupCode(@Param("invCode") String invCode, @Param("code") String code);
List<InvPreInProductDetailEntity> findBySpaceList(@Param("spaceList") List<String> spaceList);

@ -38,10 +38,6 @@ public interface InvPreProductDetailDao extends BaseMapperPlus<InvPreProductDeta
*/
boolean deleteInvPreProductDetail(FilterInvProductDetailRequest detailRequest);
List<InvPlaceDetailResponse> getInvProductInfo(FilterInvPlaceRequest filterInvPlaceRequest);
void batchBindSpace(@Param("ids") List<Integer> ids, @Param("invSpaceCode") String invSpaceCode);
List<IoOrderResponse> getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest);

@ -25,8 +25,6 @@ public interface InvPreinProductDao extends BaseMapperPlus<InvPreinProductDao, I
List<InvPreinProductResponse> filterListStock(FilterInvPreinProductRequest invPreProductRequest);
void batchBindSpace(@Param("ids") List<Integer> ids, @Param("invSpaceCode") String invSpaceCode);
/**
*
*

@ -28,16 +28,8 @@ public interface InvProductNewDao extends BaseMapperPlus<InvProductNewDao, InvPr
*/
List<InvProductNewVo> filterInvProductDetailList(FilterInvProductDetailRequest filterInvProductDetailRequest);
List<InvProductResponse> findGroupBySpace(FilterInvProductRequest filterInvProductRequest);
/**
*
*
* @param detailRequest
* @return
*/
boolean deleteInvProductDetail(FilterInvProductDetailRequest detailRequest);
/**
*
@ -47,13 +39,6 @@ public interface InvProductNewDao extends BaseMapperPlus<InvProductNewDao, InvPr
*/
List<InvPlaceDetailResponse> selectPlaceDetailList(FilterInvPlaceRequest filterInvPlaceRequest);
/**
*
*
* @param ids
* @param invSpaceCode
*/
void batchBindSpace(@Param("ids") List<Integer> ids, @Param("invSpaceCode") String invSpaceCode);
/**
* UDI
@ -63,33 +48,6 @@ public interface InvProductNewDao extends BaseMapperPlus<InvProductNewDao, InvPr
*/
InvProductNewVo selectByInvAndCode(BindInvSpaceRequest bindInvSpaceRequest);
/**
* ID(20241017===)
*
* @param code
* @return
*/
// List<String> selectSupIdByCode(@Param("code") String code);
// /**
// * 查询盘点单的码(20241017===没用到注释了)
// *
// * @param invCode
// * @param invSpaceCode
// * @param relId
// * @param batchNo
// * @return
// */
// List<String> selectCountOrderCodes(@Param("invCode") String invCode, @Param("invSpaceCode") String invSpaceCode, @Param("relId") Long relId, @Param("batchNo") String batchNo);
// /**
// * 查询库存摆放的产品详情数据(20241017===没用到注释了)
// *
// * @param filterInvPlaceRequest
// * @return
// */
// List<InvPlaceDetailResponse> getInvProductInfo(FilterInvPlaceRequest filterInvPlaceRequest);
/**
*
*

@ -58,39 +58,4 @@
where orderIdFk = #{orderIdFk}
</select>
<select id="selectCountByCodeAndOrderId" resultType="java.lang.Long">
select count(*)
from inv_count_codes
where orderIdFk = #{orderIdFk}
and code = #{code}
</select>
<update id="resetCountFiledValue">
update inv_count_codes
set status = null
where orderIdFk = #{orderId}
</update>
<select id="selectByOrderIdAndProductId" resultMap="BaseResultMap">
select *
from inv_count_codes
where orderIdFk = #{orderIdFk}
and productId = #{productId}
</select>
<select id="selectCodes" resultType="java.lang.String">
select code
from inv_count_codes
<where>
<if test="orderIdFk != null and orderIdFk != ''">
AND orderIdFk = #{orderIdFk}
</if>
<if test="productId != null and productId != ''">
AND productId = #{productId}
</if>
<if test="batchNo != null and batchNo != ''">
AND batchNo = #{batchNo}
</if>
</where>
</select>
</mapper>

@ -100,17 +100,4 @@
where orderIdFk = #{orderId}
</update>
<select id="selectDetailList" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from inv_count_order_detail
<where>
<if test="orderIdFk != null and orderIdFk != ''">
AND orderIdFk = #{orderIdFk}
</if>
<if test="status != null">
AND status = #{status}
</if>
</where>
</select>
</mapper>

@ -64,18 +64,6 @@
where id = #{id}
</select>
<select id="countBySpaceCode" resultType="java.lang.Integer">
select count(*)
from inv_count_order
<where>
<if test="invStorageCode != null and invStorageCode != ''">
AND invStorageCode = #{invStorageCode}
</if>
<if test="invSpaceCode != null and invSpaceCode != ''">
AND invWarehouseCode = #{invSpaceCode}
</if>
</where>
</select>
<update id="updateByOrderId">
update inv_count_order

@ -19,8 +19,4 @@
</where>
</select>
<select id="countSetting" resultType="java.lang.Long">
select count(*)
from inv_count_setting
</select>
</mapper>

@ -171,49 +171,6 @@
</if>
</where>
</delete>
<select id="getInvProductInfo" resultType="com.glxp.api.res.inv.InvPlaceDetailResponse">
select ipd.code,
ipd.relId,
ipd.batchNo,
ipd.serialNo,
ipd.invSpaceCode,
ipd.invCode,
bp.cpmctymc productName,
bp.ggxh,
bp.measname,
bp.zczbhhzbapzbh,
bp.manufactory,
(select name from auth_space s where s.code = ipd.invSpaceCode) invSpaceName,
(select name from basic_corp bc where bc.erpId = ipd.supId) supName
from inv_prein_product_detail ipd
left join basic_udirel bu on bu.id = ipd.relId
left join basic_products bp on bp.uuid = bu.uuid
<where>
<if test="invCode != null and invCode != ''">
AND ipd.invCode = #{invCode}
</if>
<if test="invSpaceCode != null and invSpaceCode != ''">
AND ipd.invSpaceCode = #{invSpaceCode}
</if>
<if test="code != null and code != ''">
AND ipd.code = #{code}
</if>
<if test="orderId != null and orderId != ''">
AND ipd.orderId = #{orderId}
</if>
</where>
group by ipd.id
</select>
<update id="batchBindSpace">
update inv_prein_product_detail
set invSpaceCode = #{invSpaceCode}
where id in
<foreach collection="ids" index="index" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</update>
<select id="getInvPlaceOrderList" resultType="com.glxp.api.res.inout.IoOrderResponse">
select ipd.orderId billNo,

@ -172,50 +172,6 @@
</where>
</delete>
<select id="getInvProductInfo" resultType="com.glxp.api.res.inv.InvPlaceDetailResponse">
select ipd.code,
ipd.relId,
ipd.batchNo,
ipd.serialNo,
ipd.invSpaceCode,
ipd.invCode,
bp.cpmctymc productName,
bp.ggxh,
bp.measname,
bp.zczbhhzbapzbh,
bp.manufactory,
(select name from auth_space s where s.code = ipd.invSpaceCode) invSpaceName,
(select name from basic_corp bc where bc.erpId = ipd.supId) supName
from inv_pre_product_detail ipd
left join basic_udirel bu on bu.id = ipd.relId
left join basic_products bp on bp.uuid = bu.uuid
<where>
<if test="invCode != null and invCode != ''">
AND ipd.invCode = #{invCode}
</if>
<if test="invSpaceCode != null and invSpaceCode != ''">
AND ipd.invSpaceCode = #{invSpaceCode}
</if>
<if test="code != null and code != ''">
AND ipd.code = #{code}
</if>
<if test="orderId != null and orderId != ''">
AND ipd.orderId = #{orderId}
</if>
</where>
group by ipd.id
</select>
<update id="batchBindSpace">
update inv_pre_product_detail
set invSpaceCode = #{invSpaceCode}
where id in
<foreach collection="ids" index="index" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</update>
<select id="getInvPlaceOrderList" resultType="com.glxp.api.res.inout.IoOrderResponse">
select ipd.orderId billNo,
(select name from basic_bussiness_type where action = o.action) billTypeName,

@ -208,28 +208,6 @@
</choose>
</select>
<delete id="deleteInvProductDetail">
delete
from inv_product
<where>
<if test="relId != null and relId != ''">
AND relIdFk = #{relId}
</if>
<if test="batchNo != null and batchNo != '' and batchNo != 'empty'">
AND batchNo = #{batchNo}
</if>
<if test="batchNo == 'empty'">
AND batchNo is null
</if>
<if test="supId != null and supId != ''">
AND supId = #{supId}
</if>
<if test="invCode != null and invCode != ''">
AND invCode = #{invCode}
</if>
</where>
</delete>
<select id="selectPlaceDetailList" resultType="com.glxp.api.res.inv.InvPlaceDetailResponse">
select pd.id,
<!-- pd.code,-->
@ -312,16 +290,6 @@
group by pd.invSpaceCode
</select>
<update id="batchBindSpace">
update inv_product
set invSpaceCode = #{invSpaceCode}
where id in
<foreach collection="ids" index="index" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</update>
<select id="selectByInvAndCode" resultType="com.glxp.api.vo.basic.InvProductNewVo">
select *
from inv_product
@ -331,65 +299,6 @@
limit 1
</select>
<select id="selectSupIdByCode" resultType="java.lang.String">
select supId
from inv_product_detail
where code = #{code}
</select>
<select id="selectCountOrderCodes" resultType="java.lang.String">
select distinct code
from inv_product_detail
<where>
<if test="invCode != null and invCode != ''">
AND invCode = #{invCode}
</if>
<if test="invSpaceCode != null and invSpaceCode != ''">
AND invSpaceCode = #{invSpaceCode}
</if>
<if test="relId != null">
AND relIdFk = #{relId}
</if>
<if test="batchNo != null and batchNo != ''">
AND batchNo = #{batchNo}
</if>
</where>
</select>
<select id="getInvProductInfo" resultType="com.glxp.api.res.inv.InvPlaceDetailResponse">
select ipd.code,
ipd.relId,
ipd.batchNo,
ipd.serialNo,
ipd.invSpaceCode,
ipd.invCode,
bp.cpmctymc productName,
bp.ggxh,
bp.measname,
bp.zczbhhzbapzbh,
bp.manufactory,
(select name from auth_space s where s.code = ipd.invSpaceCode) invSpaceName,
(select name from basic_corp bc where bc.erpId = ipd.supId) supName
from inv_product_detail ipd
left join basic_udirel bu on bu.id = ipd.relId
left join basic_products bp on bp.uuid = bu.uuid
<where>
<if test="invCode != null and invCode != ''">
AND ipd.invCode = #{invCode}
</if>
<if test="invSpaceCode != null and invSpaceCode != ''">
AND ipd.invSpaceCode = #{invSpaceCode}
</if>
<if test="code != null and code != ''">
AND ipd.code = #{code}
</if>
<if test="orderId != null and orderId != ''">
AND ipd.orderId = #{orderId}
</if>
</where>
group by ipd.id
</select>
<select id="getInvPlaceOrderList" resultType="com.glxp.api.res.inout.IoOrderResponse">
select odr.orderIdFk billNo,
(select name from basic_bussiness_type where action = o.action) billTypeName,

Loading…
Cancel
Save