Browse Source

fix:删除代码中写 固定租户

dev
pref_mail@163.com 7 days ago
parent
commit
76385e543d
  1. 1
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientUserMapper.xml
  2. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
  3. 21
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
  4. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
  5. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
  6. 1
      blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/job/SpiderDataJob.java
  7. 1
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml

1
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientUserMapper.xml

@ -24,3 +24,4 @@
</mapper>

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml

@ -303,7 +303,7 @@
ldsl.id = ldsld.stock_list_id
AND ldrsl.reservation_id = ldsld.reservation_id
) AS plannedQuantity,
( SELECT COALESCE ( count(*), 0 ) FROM logpm_distribution_stock lds WHERE ldsl.id = lds.stock_list_id AND lds.reservation_id =ldrsl.reservation_id AND lds.tenant_id = '627683' ) AS readyStock,
( SELECT COALESCE ( count(*), 0 ) FROM logpm_distribution_stock lds WHERE ldsl.id = lds.stock_list_id AND lds.reservation_id =ldrsl.reservation_id ) AS readyStock,
(
SELECT COALESCE
( count(*), 0 )
@ -313,7 +313,6 @@
ldsl.id = ldsld.stock_list_id
AND ldrsl.reservation_id = ldsld.reservation_id
AND ldsld.stock_locking_status = '20'
AND ldsld.tenant_id = '627683'
) AS loadingNumber,
(
SELECT COALESCE
@ -324,7 +323,6 @@
ldsl.id = ldsld.stock_list_id
AND ldrsl.reservation_id = ldsld.reservation_id
AND ldsld.stock_signfo_status = '20'
AND ldsld.tenant_id = '627683'
) AS signedingNumber,
ldsl.storage_location AS goodsAllocation,
ldsl.cargo_number AS cargoNumber

21
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@ -2518,18 +2518,13 @@
FROM
logpm_distribution_delivery_list lddl
LEFT JOIN logpm_distribution_signfor lds ON lddl.id = lds.delivery_id
AND lds.tenant_id = '627683'
LEFT JOIN logpm_distribution_reservation_package ldrp ON ldrp.reservation_id = lds.reservation_id
AND ldrp.tenant_id = '627683'
LEFT JOIN logpm_distribution_parcel_list ldpl ON ldpl.id = ldrp.parce_list_id
AND ldpl.tenant_id = '627683'
LEFT JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldpl.stock_article_id
AND ldsa.tenant_id = '627683'
WHERE
lddl.id = #{deliveryId}
AND lddl.warehouse_id = #{warehouseId}
AND ldrp.packet_bar_status != 2
AND lddl.tenant_id = '627683'
</select>
<select id="getBroadcastDataByStock" resultType="java.util.Map">
SELECT
@ -2543,22 +2538,16 @@
ldsld.num AS number,
ldsl.brand_name AS brandName,
lds.reservation_id as reservationId
FROM
logpm_distribution_delivery_list lddl
LEFT JOIN logpm_distribution_signfor lds ON lddl.id = lds.delivery_id
AND lds.tenant_id = '627683'
LEFT JOIN logpm_dis_stock_list_detail ldsld ON ldsld.reservation_id = lds.reservation_id
AND ldsld.tenant_id = '627683'
LEFT JOIN logpm_distribution_parcel_list ldpl ON ldpl.order_package_code = ldsld.stock_package_code
AND ldpl.tenant_id = '627683'
LEFT JOIN logpm_distribution_stock_list ldsl ON ldsl.id = ldsld.stock_list_id
AND ldsl.tenant_id = '627683'
WHERE
lddl.id = #{deliveryId}
AND lddl.warehouse_id = #{warehouseId}
AND ldsld.stock_package_status != 2
AND lddl.tenant_id = '627683'
</select>
<select id="getBroadcastDataByZeroOrder" resultType="java.util.Map">
@ -2578,18 +2567,13 @@
FROM
logpm_distribution_delivery_list lddl
LEFT JOIN logpm_distribution_signfor lds ON lddl.id = lds.delivery_id
AND lds.tenant_id = '627683'
LEFT JOIN logpm_distribution_reservation_zero_package ldrzp ON ldrzp.reservation_id = lds.reservation_id
AND ldrzp.tenant_id = '627683'
LEFT JOIN logpm_distribution_parcel_list ldpl ON ldpl.id = ldrzp.parcel_list_id
AND ldpl.tenant_id = '627683'
LEFT JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldpl.stock_article_id
AND ldsa.tenant_id = '627683'
WHERE
lddl.id = #{deliveryId}
AND lddl.warehouse_id = #{warehouseId}
AND ldrzp.zero_package_status != 2
AND lddl.tenant_id = '627683'
</select>
<select id="getBroadcastDataByZeroOrderAndParcId" resultType="java.util.Map">
@ -2608,19 +2592,14 @@
FROM
logpm_distribution_delivery_list lddl
LEFT JOIN logpm_distribution_signfor lds ON lddl.id = lds.delivery_id
AND lds.tenant_id = '627683'
LEFT JOIN logpm_distribution_reservation_zero_package ldrzp ON ldrzp.reservation_id = lds.reservation_id
AND ldrzp.tenant_id = '627683'
LEFT JOIN logpm_distribution_parcel_list ldpl ON ldpl.id = ldrzp.parcel_list_id
AND ldpl.tenant_id = '627683'
LEFT JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldpl.stock_article_id
AND ldsa.tenant_id = '627683'
WHERE
lddl.id = #{deliveryId}
AND lddl.warehouse_id = #{warehouseId}
AND ldrzp.parcel_list_id = #{parcelListId}
AND ldrzp.zero_package_status != 2
AND lddl.tenant_id = '627683'
</select>
<select id="selectPackageByorderPackageCodeAndDeliveryId"

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml

@ -457,7 +457,6 @@
AND ldsli.warehouse_id = ldsi.warehouse_id
AND ldsi.market_id = ldsli.market_id
AND ldsli.incoming_batch = ldsi.incoming_batch
AND ldsli.tenant_id = '627683'
LEFT JOIN logpm_warehouse_updown_goods lwug ON ldsli.parcel_list_id = lwug.association_id
AND lwug.association_type = '3'
LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lwga.id = lwug.allocation_id

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@ -524,7 +524,6 @@
WHERE
ds.id = lds.id
AND ldsi.stock_status != 4
AND ds.tenant_id = '627683'
) AS trays,
(
SELECT

1
blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/job/SpiderDataJob.java

@ -180,6 +180,7 @@ public class SpiderDataJob {
packageInfoEntity.setStatus(1);
// 判断这个包条是否存在鱼数据库 如果不存在 则执行
if(StringUtil.isNotBlank(packageNumber) &&packageInfoMapper.selectCount(new QueryWrapper<PackageInfoEntity>().eq("pa_no", packageNumber)) == 0){
packageInfoMapper.insert(packageInfoEntity);

1
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml

@ -307,7 +307,6 @@
FROM
logpm_warehouse_updown_goods
WHERE
tenant_id = '627683'
GROUP BY
association_id,
market_id,

Loading…
Cancel
Save