Browse Source

1.修复查询接口bug

dev-warehouse
zhenghaoyu 2 years ago
parent
commit
45cfa4d0ce
  1. 2
      blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java
  2. 7
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingOwnVO.java
  3. 4
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistrilbutionAppBillLadingDetailVO.java
  4. 12
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
  5. 8
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
  6. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
  7. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
  8. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.java
  9. 68
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
  10. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

2
blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java

@ -55,7 +55,7 @@ public class CommonUtil {
public static String datoLongToString(Long dateTime,String format,String timeZone){
if (StringUtils.isEmpty(timeZone)) {
if (!StringUtils.hasLength(timeZone)) {
timeZone = "Asia/Shanghai";
}
if (dateTime != null) {

7
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingOwnVO.java

@ -16,13 +16,10 @@
*/
package com.logpm.distribution.vo;
import com.logpm.distribution.entity.DistributionDeliveryChargeEntity;
import com.logpm.distribution.entity.DistrilbutionBillLadingEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
/**
* 提货单 视图实体类
*
@ -34,7 +31,7 @@ import java.util.List;
public class DistrilbutionBillLadingOwnVO extends DistrilbutionBillLadingEntity {
private static final long serialVersionUID = 1L;
private String orderSelfNumbering;
private String orderCode;
private String descriptionGoods;
private Integer totalNumber;
private String stockupStatus;
@ -42,7 +39,7 @@ public class DistrilbutionBillLadingOwnVO extends DistrilbutionBillLadingEntity
private String stockipAllocation;
private Integer esau;
private String packetBarCode;
private String orderPackageCode;
private String firsts;
private String second;
private String thirdProduct;

4
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistrilbutionAppBillLadingDetailVO.java

@ -31,9 +31,9 @@ public class DistrilbutionAppBillLadingDetailVO implements Serializable {
private static final long serialVersionUID = 1L;
private Long stockArticleId;
private String orderSelfNumbering;
private String orderCode;
private String packetBarCode;
private String orderPackageCode;
private Integer scanStatus;//扫码状态
private String scanStatusStr;//扫码状态

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

@ -722,7 +722,7 @@
</select>
<select id="selectDistributionAppDeliveryOrder" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
SELECT
ldsa.order_self_numbering orderSelfNumbering,
ldsa.order_code orderCode,
ldsa.complete_set completeSet,
ldrs.reservation_num reservationNum,
(SELECT COALESCE(COUNT(*), 0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.scan_status !=1 ) loadingNub
@ -735,7 +735,7 @@
<select id="selectListbypack" resultType="com.logpm.distribution.vo.app.DistributionAppParcelListVO">
select
DISTINCT ldrp.packet_bar_code packetBarCode,
ldsa.order_self_numbering orderSelfNumbering,
ldsa.order_code orderCode,
ldl.scan_status scanStatus
FROM
logpm_distribution_reservation_package ldrp
@ -746,15 +746,15 @@
LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id =ldpl.id
<where>
lds.delivery_id = #{param.id}
<if test="param.orderSelfNumbering != null and param.orderSelfNumbering!=''">
and ldsa.order_self_numbering = #{param.orderSelfNumbering}
<if test="param.orderCode != null and param.orderCode!=''">
and ldsa.order_code = #{param.orderCode}
</if>
</where>
</select>
<select id="selectDistributionAppDeliveryOrderO" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
SELECT
ldsa.order_self_numbering orderSelfNumbering,
ldsa.order_code orderCode,
ldsa.complete_set completeSet,
ldrs.reservation_num reservationNum,
(SELECT COALESCE(COUNT(*), 0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.scan_status !=1 ) loadingNub
@ -823,7 +823,7 @@
<select id="selectDistributionAppDeliveryOrderOIn"
resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
SELECT
ldsa.order_self_numbering orderSelfNumbering,
ldsa.order_code orderCode,
ldsa.complete_set completeSet,
ldrs.reservation_num reservationNum,
(SELECT COALESCE(COUNT(*), 0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.scan_status !=1 and ldl.signfor_state =2 ) signNub

8
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml

@ -53,15 +53,15 @@
</update>
<select id="selectOrderInfoList" resultType="com.logpm.distribution.vo.PackageStockupVO">
select ldpl.order_self_numbering orderCode,
select ldpl.order_code orderCode,
ldpl.order_package_code packageBarCode,
1 goodsType,
IF(t.id is null,0,1) isScan,
s.id scanId
IF(lds.id is null,0,1) isScan,
lds.id scanId
from logpm_distribution_reservation ldr
left join logpm_distribution_reservation_package ldrp on ldr.id = ldrp.reservation_id and ldrp.is_deleted = 0
left join logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id and ldpl.is_deleted = 0
left join logpm_distribution_stock s on s.parcel_list_id = ldpl.id and s.is_deleted = 0
left join logpm_distribution_stock lds on lds.parcel_list_id = ldpl.id and lds.is_deleted = 0
where ldpl.stock_article_id = #{stockArticleId}
and ldr.id = #{reservationId}
and CONCAT(ldpl.cargo_title,'-',ldpl.shelf_title,'-',ldpl.goods_allocation) = #{allocation}

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

@ -167,7 +167,7 @@
<select id="selectStockupOrderList" resultType="com.logpm.distribution.vo.DistributionStockupOrderListVO">
select CONCAT(ldpl.cargo_title,'-',ldpl.shelf_title,'-',ldpl.goods_allocation) allocation,
ldsa.order_self_numbering orderCode,
ldsa.order_code orderCode,
ldrs.stock_article_id stockArticleId,
ldpl.pallet pallet,
count(ldpl.id) planNum,
@ -184,7 +184,7 @@
group by ldpl.cargo_title,
ldpl.shelf_title,
ldpl.goods_allocation,
ldrs.stock_article_code,
ldsa.order_code,
ldrs.stock_article_id,
ldpl.pallet
</select>

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

@ -81,8 +81,8 @@
)
and
ldsa.is_deleted = 0 and ldsa.type_service ='2'
<if test="distributionStockArticleVO.orderSelfNumbering!=null and distributionStockArticleVO.orderSelfNumbering !=''">
and ldsa.order_self_numbering == #{distributionStockArticleVO.orderSelfNumbering}
<if test="distributionStockArticleVO.orderCode!=null and distributionStockArticleVO.orderCode !=''">
and ldsa.order_code == #{distributionStockArticleVO.orderCode}
</if>
<!-- 条件没有写完 -->
</select>

3
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.java

@ -29,7 +29,6 @@ import com.logpm.distribution.vo.DistrilbutionBillLadingOwnVO;
import com.logpm.distribution.vo.DistrilbutionBillLadingVO;
import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingDetailVO;
import org.apache.ibatis.annotations.Param;
import org.springblade.core.mp.support.Query;
import java.util.List;
@ -65,7 +64,7 @@ public interface DistrilbutionBillLadingMapper extends BaseMapper<DistrilbutionB
DistrilbutionBillLadingAppVO selectDataByBillLadingId(@Param("billLadingId") Long billLadingId);
List<DistrilbutionAppBillLadingDetailVO> selectDetailList(@Param("stockArticleId") Long stockArticleId, @Param("scanStatus") Integer scanStatus,@Param("orderSelfNumbering") String orderSelfNumbering);
List<DistrilbutionAppBillLadingDetailVO> selectDetailList(@Param("stockArticleId") Long stockArticleId, @Param("scanStatus") Integer scanStatus,@Param("orderCode") String orderSelfNumbering);
DistrilbutionBillLadingVO getOneOwn(@Param("id") Long id);

68
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml

@ -64,38 +64,38 @@
</select>
<select id="pageListApp" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingAppVO">
select ldbl.id billLadingId,
select lad.id billLadingId,
3 carType,
ldbl.`condition` `condition`,
ldbl.Pick_up_plate pickUpPlate,
ldbl.consignee consignee,
ldbl.create_time,
ldbl.pick_up_time,
ldbl.stock_article_id stockArticleId
from logpm_distrilbution_bill_lading ldbl
where ldbl.is_deleted = 0
<if test="param.pickUpTimeStart != null and param.pickUpTimeStart!='' ">ldbl.pick_up_time &lt;= #{param.pickUpTimeStart} </if>
<if test="param.pickUpTimeEnd != null and param.pickUpTimeEnd!='' ">ldbl.pick_up_time &gt;= #{param.pickUpTimeEnd} </if>
lad.`condition` `condition`,
lad.Pick_up_plate pickUpPlate,
lad.consignee consignee,
lad.create_time,
lad.pick_up_time,
lad.stock_article_id stockArticleId
from logpm_distrilbution_bill_lading lad
where lad.is_deleted = 0
<if test="param.pickUpTimeStart != null and param.pickUpTimeStart!='' ">and lad.pick_up_time &lt;= #{param.pickUpTimeStart} </if>
<if test="param.pickUpTimeEnd != null and param.pickUpTimeEnd!='' "> and lad.pick_up_time &gt;= #{param.pickUpTimeEnd} </if>
</select>
<select id="selectDataByBillLadingId" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingAppVO">
select ldbl.id billLadingId,
select lad.id billLadingId,
3 carType,
ldbl.`condition` `condition`,
ldbl.Pick_up_plate pickUpPlate,
ldbl.consignee consignee,
ldbl.create_time,
ldbl.pick_up_time,
ldbl.stock_article_id stockArticleId
from logpm_distrilbution_bill_lading ldbl
where ldbl.is_deleted = 0
and ldbl.id = #{billLadingId}
lad.`condition` `condition`,
lad.Pick_up_plate pickUpPlate,
lad.consignee consignee,
lad.create_time,
lad.pick_up_time,
lad.stock_article_id stockArticleId
from logpm_distrilbution_bill_lading lad
where lad.is_deleted = 0
and lad.id = #{billLadingId}
</select>
<select id="selectDetailList" resultType="com.logpm.distribution.vo.app.DistrilbutionAppBillLadingDetailVO">
select ldpl.stock_article_id stockArticleId,
ldpl.order_self_numbering orderSelfNumbering,
ldpl.packet_bar_code packetBarCode,
ldpl.order_code orderCode,
ldpl.order_package_code orderPackageCode,
case
when ldbls.id is null then 1
else 2
@ -106,8 +106,8 @@
<where>
and ldpl.is_deleted = 0
and ldpl.stock_article_id = #{stockArticleId}
<if test="orderSelfNumbering != null and orderSelfNumbering !=''">
and ldpl.order_self_numbering = ${orderSelfNumbering}
<if test="orderCode != null and orderCode !=''">
and ldpl.order_code = ${orderCode}
</if>
<if test="scanStatus != null and scanStatus==1">
and ldbls.id is null
@ -118,15 +118,15 @@
</where>
</select>
<select id="getOneOwn" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingVO">
select ldbl.id,ldbl.stockup_code stockupCode,ldbl.pick_up_time pickUpTime,ldbl.stockup_area stockupArea,ldbl.consignee,
ldbl.pick_up_plate pickUpPlate,ldbl.total_cost totalCost
from logpm_distrilbution_bill_lading ldbl
select lad.id,lad.stockup_code stockupCode,lad.pick_up_time pickUpTime,lad.stockup_area stockupArea,lad.consignee,
lad.pick_up_plate pickUpPlate,lad.total_cost totalCost
from logpm_distrilbution_bill_lading lad
<where>
ldbl.id = #{id}
lad.id = #{id}
</where>
</select>
<select id="detailReservationOwn" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingOwnVO">
select ldpi.id,ldpi.packet_bar_code packetBarCode,ldpi.firsts ,ldpi.second ,ldpi.third_product thirdProduct,ldpi.material_name materialName,
select ldpi.id,ldpi.order_package_code orderPackageCode,ldpi.firsts ,ldpi.second ,ldpi.third_product thirdProduct,ldpi.material_name materialName,
ldpi.goods_allocation goodsAllocation,ldpi.pallet
from logpm_distribution_parcel_list ldpi
where ldpi.stock_article_id in (
@ -136,7 +136,7 @@
)
</select>
<select id="detailOrderOwn" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingOwnVO">
select ldsa.id,ldsa.order_self_numbering orderSelfNumbering,ldsa.description_goods descriptionGoods,ldsa.total_number totalNumber,
select ldsa.id,ldsa.order_code orderCode,ldsa.description_goods descriptionGoods,ldsa.total_number totalNumber,
ldbl.stockup_status stockupStatus,ldbl.stockip_allocation stockipAllocation,
( select count(*)
from logpm_distribution_stock lds
@ -158,7 +158,7 @@
</where>
</select>
<select id="getInventoryOwn" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingOwnVO">
select ldsi.id,ldsi.sku,ldsi.order_self_numbering,ldsi.description_goods ,ldsi.cargo_unit ,lddd.quantity ,ldsi.tray_name ,ldsi.storage_location
select ldsi.id,ldsi.sku,ldsi.order_code,ldsi.description_goods ,ldsi.cargo_unit ,lddd.quantity ,ldsi.tray_name ,ldsi.storage_location
from logpm_distribution_delivery_details lddd LEFT JOIN logpm_distribution_stock_list ldsi on lddd.stock_list_id = ldsi.id
<where>
lddd.bill_lading_id = #{id}
@ -166,8 +166,8 @@
</select>
<select id="getDetailOne" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingDetailsVO">
select ldbl.id,ldbl.pick_up_time ,ldbl.consignee ,ldbl.pick_up_plate ,ldbl.delivery_document ,ldbl.certificate_type ,ldbl.total_cost
from logpm_distrilbution_bill_lading ldbl
select lad.id,lad.pick_up_time ,lad.consignee ,lad.pick_up_plate ,lad.delivery_document ,lad.certificate_type ,lad.total_cost
from logpm_distrilbution_bill_lading lad
<where>
ldbl.id = #{id}
</where>

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@ -833,7 +833,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
);
list1.forEach( di ->{
DistrilbutionAppBillLadingDetailVO billLadingDetailVO = new DistrilbutionAppBillLadingDetailVO();
billLadingDetailVO.setPacketBarCode(di.getCoding());
billLadingDetailVO.setOrderPackageCode(di.getCoding());
billLadingDetailVO.setScanStatus(Integer.parseInt(di.getConditions()));
switch (di.getConditions()){
case "2":

Loading…
Cancel
Save