java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge branch 'pre-production'

master
pref_mail@163.com 1 year ago
parent
c648986e5d 5c41259ede
commit
6117beb0dc
4 changed files with 113 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      blade-biz-common/src/main/java/org/springblade/common/utils/AddressUtil.java
  2. 81
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
  3. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
  4. 44
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

4
blade-biz-common/src/main/java/org/springblade/common/utils/AddressUtil.java
Unescape View File

@ -18,11 +18,11 @@ import java.util.Map;
public class AddressUtil {
// private static String KEY="<高德key>";
// private static String KEY="49ae079d3b85e5c9cf29034e72e2d221";
// public static String GD_URL="http://restapi.amap.com/v3/geocode/geo?key=<高德地图KEY>&address=";
public static String GD_URL="http://restapi.amap.com/v3/geocode/geo?key=af745167b52e6548d450cbbf2c6134eb&address=";
public static String GD_URL="http://restapi.amap.com/v3/geocode/geo?key=49ae079d3b85e5c9cf29034e72e2d221&address=";
public static String SUCCESS="10000";

81
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
Unescape View File

@ -1194,9 +1194,84 @@
LEFT JOIN
logpm_distribution_signfor As lds ON lds.reservation_id = ldr.id
LEFT JOIN logpm_distribution_delivery_list AS lddl ON lds.delivery_id = lddl.id
) AS m ON ldsa.id = m.stock_article_id
WHERE
ldsa.id = '1749602880861630465'
) AS m ON ldsa.id = m.stock_article_id AND t.reservation_id = m.reservation_id
<where>
ldsa.order_status in ('70','80')
<if test="param.waybillNumber != null and param.waybillNumber != ''">
AND ldsa.waybill_number like concat("%",#{param.waybillNumber},"%"})
</if>
<if test="param.serviceNumber != null and param.serviceNumber != ''">
AND ldsa.service_umber like concat("%",#{param.serviceNumber},"%"})
</if>
<if test="param.orderCode != null and param.orderCode != ''">
AND ldsa.order_code like concat("%",#{param.orderCode},"%"})
</if>
<if test="param.warehouseName != null and param.warehouseName != ''">
AND ldsa.warehouse like concat("%",#{param.warehouseName},"%"})
</if>
<if test="param.mallName != null and param.mallName != ''">
AND ldsa.mall_mame like concat("%",#{param.mallName},"%"})
</if>
<if test="param.brand != null and param.brand != ''">
AND ldsa.brand like concat("%",#{param.brand},"%"})
</if>
<if test="param.consigneePerson != null and param.consigneePerson != ''">
AND ldsa.consignee_person like concat("%",#{param.consigneePerson},"%"})
</if>
<if test="param.consigneeUnit != null and param.consigneeUnit != ''">
AND ldsa.consignee_unit like concat("%",#{param.consigneeUnit},"%"})
</if>
<if test="param.deliveryListInfo != null and param.deliveryListInfo != ''">
AND m.mssg like concat("%",#{param.deliveryListInfo},"%"})
</if>
<if test="param.driverName != null and param.driverName != ''">
AND m.driverName like concat("%",#{param.driverName},"%"})
</if>
<if test="param.examineUserNames != null and param.examineUserNames != ''">
AND m.examine_user_name like concat("%",#{param.examineUserNames},"%"})
</if>
<if test="param.reservationInfo != null and param.reservationInfo != ''">
AND t.msg like concat("%",#{param.reservationInfo},"%"})
</if>
<if test="param.warehouseId != null and param.warehouseId != ''">
AND ldsa.warehouse_id = #{param.warehouseId}
</if>
<if test="param.warehouseIdList != null and param.warehouseId != ''">
AND ldsa.warehouse_id IN
<foreach collection="param.warehouseIdList" item="item" index="index" open="AND ldsa.warehouse_id in (" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="param.orderCodeNumList != null and param.orderCodeNumList != ''">
AND ldsa.order_code in
<foreach collection="param.orderCodeNumList" item="item" index="index" open="AND ldsa.warehouse_id in (" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="param.waybillNumList != null and param.waybillNumList != ''">
AND ldsa.waybill_number in
<foreach collection="param.waybillNumList" item="item" index="index" open="AND ldsa.warehouse_id in (" close=")" separator=",">
#{item}
</foreach>
</if>
<if test=" param.startDate != null ">and ldsa.warehouse_entry_time between #{param.startDate} and
#{param.entDate}
</if>
<if test=" param.warehouseEntryTime != null ">and DATE(ldsa.warehouse_entry_time) =
#{param.warehouseEntryTime}
</if>
<if test=" param.createTime != null ">and DATE(ldsa.create_time) =
#{param.createTime}
</if>
<if test=" param.signinTime != null ">and DATE(m.signing_time) =
#{param.signinTime}
</if>
<!-- <if test=" param.warehouseEntryTimeEnd != null ">and DATE(ldsa.warehouse_entry_time) =-->
<!-- #{param.warehouseEntryTimeEnd}-->
<!-- </if>-->
</where>
GROUP BY
ldsa.id
</select>

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
Unescape View File

@ -917,7 +917,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
i.setAllocation(collect1);
}
}
});
return distributionStockArticleEntityIPage;

44
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
Unescape View File

@ -45,12 +45,14 @@ import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springblade.common.constant.DictBizConstant;
import org.springblade.common.constant.Inventory.InventoryStockUpStatusConstant;
import org.springblade.common.constant.billLading.BillLadingStatusConstant;
import org.springblade.common.constant.order.OrderReservationStatusConstant;
import org.springblade.common.constant.order.OrderStatusConstant;
import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant;
import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
import org.springblade.common.constant.pda.PdaAudioLingoStatus;
import org.springblade.common.constant.reservation.ReservationPackageStatusConstant;
import org.springblade.common.constant.stockup.StockAssignStatusConstant;
import org.springblade.common.constant.stockup.StockupStatusConstant;
import org.springblade.common.constant.stockup.StockupTypeConstant;
@ -1729,18 +1731,36 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
DistrilbutionBillLadingEntity distrilbutionBillLadingEntity = JSONObject.parseObject(JSONObject.toJSONString(distrilbutionBillLading), DistrilbutionBillLadingEntity.class);
IPage<DistrilbutionBillLadingAppVO> inventory = baseMapper.getInventory(page, distrilbutionBillLadingEntity);
inventory.getRecords().forEach(i -> {
if (i.getQuantity().equals(i.getDeliveryNum())) {
//已备货
List<DistributionBillLadingScanEntity> list = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
.eq(DistributionBillLadingScanEntity::getBillLadingId, distrilbutionBillLadingEntity.getId())
.eq(DistributionBillLadingScanEntity::getMaterialType, '1')
);
i.setEsauInventoryNum(list.size());
} else {
//没有备货完成
List<DisStockListDetailEntity> listed = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
.eq(DisStockListDetailEntity::getReservationId, i.getId())
.ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
);
if (Func.isNotEmpty(listed)){
int sum = listed.stream().filter(f -> InventoryStockUpStatusConstant.yibeihuo.getValue().equals(f.getStockStatus()) && Func.isNotEmpty(f.getStockPackageCode())).mapToInt(DisStockListDetailEntity::getNum).sum();
log.info(i.getDescriptionGoods()+">>>>>>>>>>>>>>自提客户备货库存数量:",sum);
if (sum == i.getQuantity()){
i.setEsauInventoryNum(sum);
}else {
i.setEsauInventoryNum(-1);
}
}else {
i.setEsauInventoryNum(-1);
}
// if (i.getQuantity().equals(i.getDeliveryNum())) {
//已备货
// List<DistributionBillLadingScanEntity> list = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
// .eq(DistributionBillLadingScanEntity::getBillLadingId, distrilbutionBillLadingEntity.getId())
// .eq(DistributionBillLadingScanEntity::getMaterialType, '1')
// );
// i.setEsauInventoryNum(list.size());
// } else {
//没有备货完成
// i.setEsauInventoryNum(-1);
// }
});
return inventory;
@ -1808,6 +1828,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
distributionBillLadingScan.setStockListId(inventoryAppVO.getStockListId());
distributionBillLadingScan.setQuantity(1);
distributionBillLadingScanService.save(distributionBillLadingScan);
} else {
return Resp.scanFail("包件信息不存在", "包件信息不存在");
}
@ -1914,7 +1936,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
log.info(coding + " > > 签收成功!!");
return Resp.scanSuccess("签收成功", "");
return Resp.scanSuccess("签收成功", "签收成功");
}
}

Write Preview
Loading…
Cancel
Save