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

1.修改干线数据的订单码无法显示始发仓和目的仓

dist.1.3.0
pref_mail@163.com 8 months ago
parent
b66a41fd0c
commit
7f0e06d36e
2 changed files with 17 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. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
  2. 32
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

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

@ -342,7 +342,7 @@
<select id="getOrderNoList" resultType="com.logpm.distribution.vo.DistributionStockArticleQRCodeVO">
select ldsa.id,ldsa.order_code,ldsa.mall_name ,ldsa.customer_name ,ldsa.customer_telephone ,
ldsa.customer_address ,ldsa.sending,ldpl.waybill_number waybillNumber,
ldsa.accept_warehouse_name as objective ,ldsa.send_warehouse_name departureStation,ldsa.dealer_name
ldpl.accept_warehouse_name as objective ,ldpl.send_warehouse_name departureStation,ldsa.dealer_name
dealerName,ldsa.dealer_code dealerCode,ldsa.total_number totalNumber,
CONCAT_WS('/', IFNULL(ldpl.firsts, ''), IFNULL(ldpl.second, ''), IFNULL(ldpl.third_product, '')) AS category,
CONCAT_WS( '',IFNULL(ldpl.material_name, '')) AS materialName ,ldpl.order_package_code

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

@ -62,6 +62,7 @@ import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient;
import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
import lombok.extern.log4j.Log4j2;
import org.apache.logging.log4j.util.Strings;
import org.jetbrains.annotations.NotNull;
import org.springblade.common.constant.DictBizConstant;
import org.springblade.common.constant.Inventory.InventoryStockUpStatusConstant;
import org.springblade.common.constant.RabbitConstant;
@ -646,14 +647,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
);
if (!Func.isEmpty(parcelListEntities)) {
for (DistributionParcelListEntity parcelListEntity : parcelListEntities) {
DistrilbutionBillPackageEntity billPackageEntity = new DistrilbutionBillPackageEntity();
billPackageEntity.setBillLadingId(distrilbutionBillLading.getId());
billPackageEntity.setPacketBarStatus(1);
billPackageEntity.setBillType("1");
billPackageEntity.setPacketNumber(parcelListEntity.getQuantity());
billPackageEntity.setParceListId(parcelListEntity.getId());
billPackageEntity.setStockArticleId(parcelListEntity.getStockArticleId());
billPackageEntity.setPacketBarCode(parcelListEntity.getOrderPackageCode());
DistrilbutionBillPackageEntity billPackageEntity = getDistrilbutionBillPackageEntity(distrilbutionBillLading, parcelListEntity);
packageEntityList.add(billPackageEntity);
packageIds.add(parcelListEntity.getId());
String content = "包件在"+myCurrentWarehouse.getName()+"由"+AuthUtil.getNickName()+"计划自提,操作方式:新增订单系统默认可用包件,自提批次号:"+distrilbutionBillLading.getPickupBatch();
@ -678,14 +672,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
);
if (!Func.isEmpty(parcelListEntities)) {
for (DistributionParcelListEntity parcelListEntity : parcelListEntities) {
DistrilbutionBillPackageEntity billPackageEntity = new DistrilbutionBillPackageEntity();
billPackageEntity.setBillLadingId(distrilbutionBillLading.getId());
billPackageEntity.setPacketBarStatus(1);
billPackageEntity.setBillType("1");
billPackageEntity.setPacketNumber(parcelListEntity.getQuantity());
billPackageEntity.setParceListId(parcelListEntity.getId());
billPackageEntity.setStockArticleId(parcelListEntity.getStockArticleId());
billPackageEntity.setPacketBarCode(parcelListEntity.getOrderPackageCode());
DistrilbutionBillPackageEntity billPackageEntity = getDistrilbutionBillPackageEntity(distrilbutionBillLading, parcelListEntity);
packageEntityList.add(billPackageEntity);
packageIds.add(parcelListEntity.getId());
String content = "包件在"+myCurrentWarehouse.getName()+"由"+AuthUtil.getNickName()+"计划自提,操作方式:新增订单系统默认可用包件,自提批次号:"+distrilbutionBillLading.getPickupBatch();
@ -872,6 +859,19 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
return true;
}
@NotNull
private static DistrilbutionBillPackageEntity getDistrilbutionBillPackageEntity(DistrilbutionBillLadingDTO distrilbutionBillLading, DistributionParcelListEntity parcelListEntity) {
DistrilbutionBillPackageEntity billPackageEntity = new DistrilbutionBillPackageEntity();
billPackageEntity.setBillLadingId(distrilbutionBillLading.getId());
billPackageEntity.setPacketBarStatus(1);
billPackageEntity.setBillType("1");
billPackageEntity.setPacketNumber(parcelListEntity.getQuantity());
billPackageEntity.setParceListId(parcelListEntity.getId());
billPackageEntity.setStockArticleId(parcelListEntity.getStockArticleId());
billPackageEntity.setPacketBarCode(parcelListEntity.getOrderPackageCode());
return billPackageEntity;
}
@Override
public boolean signImages(DistrilbutionBillLadingDTO distrilbutionBillLading) {

Write Preview
Loading…
Cancel
Save