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

Merge remote-tracking branch 'origin/dev' into dev

dev-warehouse
0.0 2 years ago
parent
96888d2cbb 157ce45e08
commit
eaf466a176
26 changed files with 156 additions and 110 deletions
Split View
  1. 11
      blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java
  2. 19
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
  3. 13
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java
  4. 3
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java
  5. 2
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java
  6. 4
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
  7. 6
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java
  8. 3
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java
  9. 29
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java
  10. 10
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
  11. 10
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
  12. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
  13. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml
  14. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
  15. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
  16. 31
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
  17. 37
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
  18. 11
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
  19. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
  20. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
  21. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java
  22. 33
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionReservationWrapper.java
  23. 8
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java
  24. 2
      blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
  25. 2
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
  26. 12
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

11
blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java
Unescape View File

@ -12,14 +12,21 @@ public class DictBizConstant {
public static final String DEFAULT_DEPT_ID = "default_dept_id";//默认部门ID
public static final String DELIVERY_ORDER_STATUS = "order_status";//配送订单状态
public static final String ORDER_PACKAGE_STATUS = "order_package_status";//配送包件状态
public static final String BASIC_GROUNDING = "basic_grounding";//上架状态
public static final String STOCKUP_STATUS = "stockup_status";//备货状态
public static final String RESERVATION_STATUS = "reservation_status";//预约状态
public static final String RESERVATION_STATUS = "order_reservation_status";//预约状态
public static final String ORDER_PACKAGE_STATUS = "order_package_status";//配送包件状态
public static final String ORDER_PACKAGE_FREEZE_STATUS = "order_package_freeze_status";//包间冻结状态
public static final String PDA_AUDIO = "pda_audio";//PDA扫码语音
//--------------2023-08-02 ---------------------
public static final String PERIOD_OF_TIME = "period_of_time";//时段
}

19
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
Unescape View File

@ -17,14 +17,15 @@
package com.logpm.distribution.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import java.math.BigDecimal;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
import java.math.BigDecimal;
import java.util.Date;
/**
* 配送管理 实体类
*
@ -203,7 +204,7 @@ public class DistributionDeliveryListEntity extends TenantEntity {
* 订单自编号
*/
@ApiModelProperty(value = "订单自编号")
private String orderSelfNumbering;
private String orderCode;
/**
* 备货时间
*/
@ -238,11 +239,11 @@ public class DistributionDeliveryListEntity extends TenantEntity {
private Integer source;
/**
* 定位打卡地址
*/
@ApiModelProperty(value = "定位打卡地址")
private String deliveryState;
// /**
// * 定位打卡地址
// */
// @ApiModelProperty(value = "定位打卡地址")
// private String deliveryState;

13
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java
Unescape View File

@ -24,8 +24,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
import java.math.BigInteger;
/**
* 在库订单包件清单 实体类
*
@ -67,7 +65,7 @@ public class DistributionParcelListEntity extends TenantEntity {
* 订单自编号
*/
@ApiModelProperty(value = "订单自编号")
private String orderSelfNumbering;
private String orderCode;
/**
* 仓库
*/
@ -85,7 +83,8 @@ public class DistributionParcelListEntity extends TenantEntity {
* 包条码
*/
@ApiModelProperty(value = "包条码")
private String packetBarCode;
@TableField("order_package_code")
private String orderPackageCode;
@ApiModelProperty(value = "货区信息")
private String cargoTitle;
@ -186,6 +185,12 @@ public class DistributionParcelListEntity extends TenantEntity {
@ApiModelProperty(value = "包件状态")
private String orderPackageStatus;
@ApiModelProperty(value = "包件冻结状态")
private String orderPackageFreezeStatus;
// /**
// * 配送状态

3
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java
Unescape View File

@ -27,7 +27,6 @@ import org.springblade.core.tenant.mp.TenantEntity;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* 配送在库订单 实体类
@ -83,7 +82,7 @@ public class DistributionStockArticleEntity extends TenantEntity {
* 订单自编号
*/
@ApiModelProperty(value = "订单自编号")
private String orderSelfNumbering;
private String orderCode;
/**
* 门店id

2
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java
Unescape View File

@ -78,7 +78,7 @@ public class DistributionStockListEntity extends TenantEntity {
* 订单自编号
*/
@ApiModelProperty(value = "订单自编号")
private String orderSelfNumbering;
private String orderCode;
/**
* 在库订单ID
*/

4
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
Unescape View File

@ -44,6 +44,10 @@ public class DistributionParcelListVO extends DistributionParcelListEntity {
* 包件状态名称
*/
private String orderPackageStatusName;
/**
* 包件冻结状态
*/
private String orderPackageFreezeStatusName;
}

6
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java
Unescape View File

@ -16,10 +16,7 @@
*/
package com.logpm.distribution.vo;
import com.logpm.distribution.entity.DistributionAddvalueEntity;
import com.logpm.distribution.entity.DistributionReservationEntity;
import com.logpm.distribution.entity.DistributionStockArticleEntity;
import com.logpm.distribution.entity.DistributionStockListEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -37,6 +34,9 @@ import java.util.List;
public class DistributionReservationVO extends DistributionReservationEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "时段名称")
private String periodOfTimeName;
/**
* 库存品信息列表

3
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java
Unescape View File

@ -17,7 +17,6 @@
package com.logpm.distribution.vo;
import com.logpm.distribution.entity.DistributionStockupEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -61,7 +60,7 @@ public class DistributionStockupVO extends DistributionStockupEntity {
private String deliveryPhone;
private String mallName;
private String stockArticleId;
private String orderSelfNumbering; //订单自编号
private String orderCode; //订单自编号
private String descriptionGoods;
private String reservationNum;
private Date stockupDate;

29
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java
Unescape View File

@ -16,35 +16,36 @@
*/
package com.logpm.distribution.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.logpm.distribution.dto.DistributionDeliveryAllocationDTO;
import com.logpm.distribution.dto.DistributionReservationDTO;
import com.logpm.distribution.entity.DistributionReservationEntity;
import com.logpm.distribution.excel.DistributionReservationExcel;
import com.logpm.distribution.service.IDistributionReservationService;
import com.logpm.distribution.vo.DistributionReservationVO;
import com.logpm.distribution.wrapper.DistributionReservationWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
import java.util.Map;
/**
* 预约列表 控制器
@ -77,9 +78,9 @@ public class DistributionReservationController extends BladeController {
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入distrbutionReservation")
public R<IPage<DistributionReservationEntity>> list(@ApiIgnore @RequestParam Map<String, Object> distrbutionReservation, Query query) {
public R<IPage<DistributionReservationVO>> list(@ApiIgnore @RequestParam Map<String, Object> distrbutionReservation, Query query) {
IPage<DistributionReservationEntity> pages = reservationService.page(Condition.getPage(query), Condition.getQueryWrapper(distrbutionReservation, DistributionReservationEntity.class));
return R.data(pages);
return R.data(DistributionReservationWrapper.build().pageVO(pages));
}
/**

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

@ -171,7 +171,7 @@
<select id="selectDistributionDeliveryinventoryPage" resultType="com.logpm.distribution.vo.DistributionStockListVO">
select
ldsl.sku sku,
ldsl.order_self_numbering orderSelfNumbering,
ldsl.order_code orderCode,
ldsl.description_goods descriptionGoods,
ldsl.unit unit,
( SELECT
@ -202,7 +202,7 @@
</select>
<select id="selectDistributionDeliveryOrderPage" resultType="com.logpm.distribution.vo.DistributionStockArticleVO">
SELECT
distinct ldsa.order_self_numbering orderSelfNumbering,
distinct ldsa.order_code orderCode,
ldsa.description_goods descriptionGoods,
(
SELECT
@ -264,7 +264,7 @@
</select>
<select id="selectDistributionAppDeliveryOrderPage" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
SELECT
ldsa.order_self_numbering orderSelfNumbering,
ldsa.order_code orderCdoe,
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
@ -277,8 +277,8 @@
<if test="param.state != null and param.state!=''">
and ldsa.state = #{param.state}
</if>
<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>
AND ldr.id = #{param.reservationId}
</where>

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

@ -20,13 +20,15 @@
<result column="reserve5" property="reserve5"/>
<result column="warehouse" property="warehouse"/>
<result column="conditions" property="conditions"/>
<result column="packet_bar_code" property="packetBarCode"/>
<result column="order_package_code" property="orderPackageCode"/>
<result column="goods_allocation" property="goodsAllocation"/>
<result column="pallet" property="pallet"/>
<result column="firsts" property="firsts"/>
<result column="second" property="second"/>
<result column="third_product" property="thirdProduct"/>
<result column="material" property="material"/>
<result column="material_id" property="materialId"/>
<result column="material_name" property="materialName"/>
<result column="material_code" property="materialCode"/>
<result column="quantity" property="quantity"/>
<result column="train_number" property="trainNumber"/>
<result column="stock_article_id" property="stockArticleId"/>
@ -52,7 +54,7 @@
<select id="selectOrderInfoList" resultType="com.logpm.distribution.vo.PackageStockupVO">
select ldpl.order_self_numbering orderCode,
ldpl.packet_bar_code packageBarCode,
ldpl.order_package_code packageBarCode,
1 goodsType,
IF(t.id is null,0,1) isScan,
s.id scanId
@ -89,7 +91,7 @@
group by ldpl.pallet
</select>
<select id="getParcelListOwn" resultType="com.logpm.distribution.vo.DistributionParcelListVO">
select DISTINCT ldpl.id, ldpl.packet_bar_code packetBarCode, ldpl.firsts ,ldpl.second ,ldpl.third_product thirdProduct,ldpl.material_name materialName,
select DISTINCT ldpl.id, ldpl.order_package_code packetBarCode, ldpl.firsts ,ldpl.second ,ldpl.third_product thirdProduct,ldpl.material_name materialName,
lds.stockup_status stockupStatus,lds.stockup_date stockupDate,
lds.stockup_area stockupArea,ldpl.goods_allocation goodsAllocation,ldpl.pallet
from logpm_distribution_parcel_list ldpl

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

@ -93,7 +93,7 @@
ldsa.is_deleted,
ldsa.create_dept,
ldsa.service_number,
ldsa.order_self_numbering,
ldsa.order_code,
ldsa.mall_id,
ldsa.mall_code,
ldsa.mall_name,

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

@ -111,8 +111,7 @@
ldpl.material_code,
ldpl.material_unit,
ldpl.brand_id,
ldpl.brand_name,
ldpl.delivery_state
ldpl.brand_name
FROM
( SELECT reservation_id FROM logpm_distribution_signfor
<where>

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

@ -103,7 +103,7 @@
ldsa.reserve4,
ldsa.reserve5,
ldsa.service_number,
ldsa.order_self_numbering,
ldsa.order_code,
ldsa.mall_id,
ldsa.mall_code,
ldsa.mall_name,
@ -124,7 +124,7 @@
ldsa.customer_telephone,
ldsa.customer_address,
ldsa.genre,
ldsa.state,
ldsa.order_status,
ldsa.notification,
ldsa.fee,
ldsa.rate,

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

@ -185,7 +185,7 @@
</select>
<select id="detailOrderOwn" resultType="com.logpm.distribution.vo.DistributionStockupVO">
select ldsa.order_self_numbering orderSelfNumbering,ldsa.description_goods descriptionGoods,ldrs.reservation_num reservationNum,
select ldsa.order_code orderCode,ldsa.description_goods descriptionGoods,ldrs.reservation_num reservationNum,
lds.stockup_status stockupStatus,lds.stockup_date stockupDate,lds.stockup_area stockupArea,(
select count(1)
from logpm_distribution_stock ds

31
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
Unescape View File

@ -16,28 +16,25 @@
*/
package com.logpm.distribution.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.distribution.dto.*;
import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO;
import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO;
import com.logpm.distribution.entity.*;
import com.logpm.distribution.excel.DistributionDeliveryListExcel;
import com.logpm.distribution.mapper.*;
import com.logpm.distribution.service.*;
import com.logpm.distribution.vo.*;
import com.logpm.distribution.excel.DistributionDeliveryListExcel;
import com.logpm.distribution.service.IDistributionDeliveryListService;
import com.logpm.distribution.vo.app.*;
import com.logpm.distribution.vo.app.DistributionAppDeliveryListVO;
import com.logpm.distribution.vo.app.DistributionAppDeliverySelfVO;
import com.logpm.distribution.vo.app.DistributionAppLoadscanVO;
import com.logpm.distribution.vo.app.DistributionAppReservationVO;
import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2;
import net.bytebuddy.implementation.bytecode.Throw;
import org.apache.commons.lang.StringUtils;
import org.springblade.common.serviceConstant.ServiceConstant;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
@ -47,15 +44,11 @@ import org.springblade.core.tool.utils.RandomType;
import org.springblade.system.feign.IDictBizClient;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@ -1269,7 +1262,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
parcelListEntities.forEach(p->{
DistributionReservationPackageEntity reservationPackageEntity = new DistributionReservationPackageEntity();
reservationPackageEntity.setReservationId(reservationEntity.getId());
reservationPackageEntity.setPacketBarCode(p.getPacketBarCode());
reservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
reservationPackageEntity.setStockArticleId(p.getStockArticleId());
reservationPackageEntity.setParceListId(p.getId());
distributionReservationPackageService.save(reservationPackageEntity);
@ -1283,7 +1276,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
packageList.forEach(p->{
DistributionReservationPackageEntity reservationPackageEntity = new DistributionReservationPackageEntity();
reservationPackageEntity.setReservationId(reservationEntity.getId());
reservationPackageEntity.setPacketBarCode(p.getPacketBarCode());
reservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
reservationPackageEntity.setStockArticleId(p.getStockArticleId());
reservationPackageEntity.setParceListId(p.getId());
distributionReservationPackageService.save(reservationPackageEntity);
@ -1303,14 +1296,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//订单发生修改包件的操作，先对该预约下的订单进行解绑
Integer i = distributionReservationPackageMapper.deletePackageByRidAndSid(reservationEntity.getId(),o.getId());
//构建新的
if (o.getPackageList().size()==0){
if (!Func.isEmpty(o.getPackageList())){
//订单全选
LambdaQueryWrapper<DistributionParcelListEntity> qw = new QueryWrapper<DistributionParcelListEntity>().lambda().eq(DistributionParcelListEntity::getStockArticleId, o.getId());
List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.getBaseMapper().selectList(qw);
parcelListEntities.forEach(p->{
DistributionReservationPackageEntity reservationPackageEntity = new DistributionReservationPackageEntity();
reservationPackageEntity.setReservationId(reservationEntity.getId());
reservationPackageEntity.setPacketBarCode(p.getPacketBarCode());
reservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
reservationPackageEntity.setStockArticleId(p.getStockArticleId());
reservationPackageEntity.setParceListId(p.getId());
distributionReservationPackageService.save(reservationPackageEntity);
@ -1325,7 +1318,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
packageList.forEach(p->{
DistributionReservationPackageEntity reservationPackageEntity = new DistributionReservationPackageEntity();
reservationPackageEntity.setReservationId(reservationEntity.getId());
reservationPackageEntity.setPacketBarCode(p.getPacketBarCode());
reservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
reservationPackageEntity.setStockArticleId(p.getStockArticleId());
reservationPackageEntity.setParceListId(p.getId());
distributionReservationPackageService.save(reservationPackageEntity);
@ -1393,7 +1386,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
reservationPackageEntity.setStockArticleId(s.getId());
reservationPackageEntity.setReservationId(reservationEntity.getId());
reservationPackageEntity.setParceListId(p.getId());
reservationPackageEntity.setPacketBarCode(p.getPacketBarCode());
reservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
distributionReservationPackageService.save(reservationPackageEntity);
packageTotal.getAndAdd(p.getQuantity());
//TODO 这里还需要对包件状态进行修改
@ -1409,7 +1402,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
reservationPackageEntity.setStockArticleId(s.getId());
reservationPackageEntity.setReservationId(reservationEntity.getId());
reservationPackageEntity.setParceListId(dp.getId());
reservationPackageEntity.setPacketBarCode(dp.getPacketBarCode());
reservationPackageEntity.setPacketBarCode(dp.getOrderPackageCode());
distributionReservationPackageService.save(reservationPackageEntity);
packageTotal.getAndAdd(dp.getQuantity());
//TODO 这里还需要对包件状态进行修改
@ -1426,7 +1419,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
distributionReservationStockarticleService.save(reservationStockarticleEntity);
//统计订单的包件数量
orderTotal.getAndAdd(reservationStockarticleEntity.getReservationNum());
str.add(s.getOrderSelfNumbering());
str.add(s.getOrderCode());
});
//对预约信息进行修改
String s = String.join(",", str);

37
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
Unescape View File

@ -221,7 +221,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
//预约订单数量
AtomicInteger packageNum = new AtomicInteger();
List<DistributionParcelListEntity> packageList = s.getPackageList();
if (packageList.size() == 0) {
if (Func.isEmpty(packageList)) {
Map<String, Object> map = new HashMap<>();
map.put("stockArticleId", s.getId());
QueryWrapper<DistributionParcelListEntity> qw = Condition.getQueryWrapper(map, DistributionParcelListEntity.class);
@ -232,7 +232,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
distributionReservationPackageEntity.setReservationId(reservationId);
distributionReservationPackageEntity.setParceListId(p.getId());
distributionReservationPackageEntity.setStockArticleId(s.getId());
distributionReservationPackageEntity.setPacketBarCode(p.getPacketBarCode());
distributionReservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
//维护订单下包件信息
distributionReservationPackageService.save(distributionReservationPackageEntity);
//此时订单下的所有包件都处于预约状态，可用数为0
@ -261,7 +261,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
distributionReservationStockarticleEntity.setReservationNum(packageNum.get());
//订单无数据源，不需要进行包件信息维护
//修改订单状态为已预约
s.setOrderStatus(ServiceConstant.ORDER_STATE_ALREADY_RESERVATION);
// s.setOrderStatus(ServiceConstant.ORDER_STATE_ALREADY_RESERVATION);
s.setReservationStatus(30+"");// TODO 需要根据订单预约的包件数量是否等于订单总包件数量，存入 部分预约和已预约的状态值
stockArticleCount.getAndAdd(s.getReservationNum());
DistributionStockArticleEntity stockArticleEntity = Func.copy(s, DistributionStockArticleEntity.class);
// if (stockArticleEntity.getStoreId()==-1){
@ -281,7 +282,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
// }
distributionStockArticleService.updateById(s);
//拼接订单自编号
arrayList.add(s.getOrderSelfNumbering());
arrayList.add(s.getOrderCode());
//拼接服务号
serviceNumber.add(s.getServiceNumber());
// //订单增值服务费
@ -312,7 +313,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
i.setQuantityOccupied(quantityOccupied+i.getReservationNum());
distributionStockListService.updateById(i);
Long stocklistId = i.getId();
arrayList.add(i.getOrderSelfNumbering());
arrayList.add(i.getOrderCode());
DistributionReservationStocklistEntity distributionReservationStocklistEntity = new DistributionReservationStocklistEntity();
distributionReservationStocklistEntity.setReservationId(reservationId);
distributionReservationStocklistEntity.setStocklistId(stocklistId);
@ -560,7 +561,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
//拼接订单编号
orderIds.append(stockArticleEntity.getId()).append(",");
//拼接订单自编号
hashSet.add(stockArticleEntity.getOrderSelfNumbering());
hashSet.add(stockArticleEntity.getOrderCode());
//存在数据来源，维护订单、包件和配送的关系
if (stockArticleEntity.getHandQuantity() > r.getReservationNum()) {
//这里表示订单下的包件没有进行全部配送
@ -578,7 +579,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
reservationStocklistEntityList.forEach(l -> {
DistributionStockListEntity stockListEntity = distributionStockListService.getById(l.getStocklistId());
stockListEntity.setQuantityStock(stockListEntity.getQuantityStock() - l.getReservationNum());
hashSet.add(stockListEntity.getOrderSelfNumbering());
hashSet.add(stockListEntity.getOrderCode());
stockListId.append(stockListEntity.getId()).append(",");
//这里需要将库存品信息和配送进行信息绑定
DistributionLoadscaninvnEntity loadscaninvnEntity = new DistributionLoadscaninvnEntity();
@ -651,7 +652,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
distributionDeliveryListEntity.setCustomersNumber(reservationIds.split(",").length);
distributionDeliveryListEntity.setOrderNumber(orderNum.get());
distributionDeliveryListEntity.setType(ServiceConstant.DELIVERY_TYPE_CUSTOMER);
distributionDeliveryListEntity.setOrderSelfNumbering(String.join(",", hashSet));
distributionDeliveryListEntity.setOrderCode(String.join(",", hashSet));
if (orderIds.length() > 1) {
distributionDeliveryListEntity.setOrderId(orderIds.deleteCharAt(orderIds.length() - 1).toString());
}
@ -775,7 +776,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
packageNum.getAndIncrement();
DistributionReservationPackageEntity distributionReservationPackageEntity = new DistributionReservationPackageEntity();
distributionReservationPackageEntity.setReservationId(distributionReservationDTO.getId());
distributionReservationPackageEntity.setPacketBarCode(p.getPacketBarCode());
distributionReservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
distributionReservationPackageEntity.setParceListId(p.getId());
distributionReservationPackageEntity.setStockArticleId(s.getId());
//维护订单下包件信息
@ -791,7 +792,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
distributionReservationPackageEntity.setReservationId(distributionReservationDTO.getId());
distributionReservationPackageEntity.setParceListId(p.getId());
distributionReservationPackageEntity.setStockArticleId(s.getId());
distributionReservationPackageEntity.setPacketBarCode(p.getPacketBarCode());
distributionReservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
distributionReservationPackageService.save(distributionReservationPackageEntity);
});
s.setAvailableQuantity(s.getAvailableQuantity() - s.getReservationNum());
@ -811,7 +812,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
initTotal.getAndAccumulate(new BigDecimal(s.getStorageFee().toString()), BigDecimal::add);
//协商费用
initTotal.getAndAccumulate(new BigDecimal(s.getRate().toString()), BigDecimal::add);
hashSet.add(s.getOrderSelfNumbering());
hashSet.add(s.getOrderCode());
});
}
List<DistributionStockListDTO> inventoryList = distributionReservationDTO.getInventoryList();
@ -828,7 +829,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
distributionReservationStocklistEntity.setReservationNum(i.getReservationNum());
distributionReservationStocklistEntity.setStocklistId(i.getId());
distributionReservationStocklistService.save(distributionReservationStocklistEntity);
hashSet.add(i.getOrderSelfNumbering());
hashSet.add(i.getOrderCode());
stockListNum.getAndAdd(distributionReservationStocklistEntity.getReservationNum());
});
}
@ -945,14 +946,14 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
//维护订单数据，订单状态直接变更未待配送
stockArticleEntity.setOrderStatus(ServiceConstant.ORDER_STATE_WAIT_DELIVERY);
distributionStockArticleService.updateById(stockArticleEntity);
orderSelfNumbering.append(stockArticleEntity.getOrderSelfNumbering()).append(",");
orderSelfNumbering.append(stockArticleEntity.getOrderCode()).append(",");
//订单数量累加
AtomicInteger packageCount = new AtomicInteger();
//订单存在数据源，维护订单包件信息
//维护预约和订单关系
DistributionReservationStockarticleEntity reservationStockarticleEntity = new DistributionReservationStockarticleEntity();
List<DistributionParcelListEntity> packageList = a.getPackageList();
if (a.getPackageList().size() == 0) {
if (Objects.isNull(packageList) || packageList.size() == 0) {
Map<String, Object> map = new HashMap<String, Object>();
//这里就是默认添加订单下的所有包件
map.put("stockArticleId", stockArticleEntity.getId());
@ -964,7 +965,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
DistributionReservationPackageEntity reservationPackageEntity = new DistributionReservationPackageEntity();
reservationPackageEntity.setReservationId(reservationEntity.getId());
reservationPackageEntity.setStockArticleId(stockArticleEntity.getId());
reservationPackageEntity.setPacketBarCode(p.getPacketBarCode());
reservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
reservationPackageEntity.setParceListId(p.getId());
distributionReservationPackageService.save(reservationPackageEntity);
});
@ -974,7 +975,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
packageCount.getAndAdd(p.getQuantity());
DistributionReservationPackageEntity reservationPackageEntity = new DistributionReservationPackageEntity();
reservationPackageEntity.setReservationId(reservationEntity.getId());
reservationPackageEntity.setPacketBarCode(p.getPacketBarCode());
reservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
reservationPackageEntity.setStockArticleId(stockArticleEntity.getId());
reservationPackageEntity.setParceListId(p.getId());
distributionReservationPackageService.save(reservationPackageEntity);
@ -1019,7 +1020,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
// tripartiteEntity.setReservationIds(reservationIds);
tripartiteEntity.setDeliveryId(distributionDeliveryListEntity.getId());
distributionDeliveryTripartiteService.save(tripartiteEntity);
distributionDeliveryListEntity.setKind(ServiceConstant.DELIVERLIST_KIND_TRIPARTITE);
distributionDeliveryListEntity.setKind(ServiceConstant.DELIVERLIST_KIND_SELF);
distributionDeliveryListEntity.setDriverName(tripartiteEntity.getDriverName());
distributionDeliveryListEntity.setVehicleName(tripartiteEntity.getVehicleNum());
distributionDeliveryListEntity.setDistributionCompany(tripartite.getDistributionCompany());
@ -1058,7 +1059,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
// distributionDeliveryListEntity.setLoadingTeamName(stockup.getLoaderName());
// distributionDeliveryListEntity.setLoadingTeamId(stockup.getLoaderId());
// distributionDeliveryListEntity.setLeadTime(stockup.getStockupDate());
distributionDeliveryListEntity.setOrderSelfNumbering(orderSelfNumbering.deleteCharAt(orderSelfNumbering.length() - 1).toString());
distributionDeliveryListEntity.setOrderCode(orderSelfNumbering.deleteCharAt(orderSelfNumbering.length() - 1).toString());
distributionDeliveryListEntity.setOrderNumber(orderTotal.get());
distributionDeliveryListEntity.setDeliveryNumber(packageTotal.get());
distributionDeliveryListEntity.setCustomersNumber(clientNum.get());

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

@ -16,11 +16,9 @@
*/
package com.logpm.distribution.service.impl;
import com.aliyuncs.unmarshaller.JsonUnmashaller;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
@ -33,14 +31,13 @@ import com.logpm.distribution.mapper.DistributionAddvalueMapper;
import com.logpm.distribution.mapper.DistributionDeliveryListMapper;
import com.logpm.distribution.mapper.DistributionStockArticleMapper;
import com.logpm.distribution.service.*;
import com.logpm.distribution.vo.DistributionParcelListVO;
import com.logpm.distribution.vo.DistributionStockArticleVO;
import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.common.constant.DictBizConstant;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
@ -287,7 +284,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
DistributionStockListEntity distributionStockListEntity = new DistributionStockListEntity();
distributionStockListEntity.setStockArticleId(Optional.ofNullable(distributionParcelList.getStockArticleId()).orElse(null)); //订单ID
distributionStockListEntity.setOrderSelfNumbering(Optional.ofNullable(distributionStockArticleEntity.getOrderSelfNumbering()).orElse(null)); //订单自编号
distributionStockListEntity.setOrderCode(Optional.ofNullable(distributionStockArticleEntity.getOrderCode()).orElse(null)); //订单自编号
// distributionStockListEntity.setIncomingBatch(distributionStockArticleEntity.get); //入库批次号
distributionStockListEntity.setServiceNumber(Optional.ofNullable(distributionStockArticleEntity.getServiceNumber()).orElse(null)); //服务号
distributionStockListEntity.setDescriptionGoods(Optional.ofNullable(distributionParcelList.getMaterialName()).orElse(null)); //物料名称
@ -332,8 +329,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
//这里进行订单查询
l.forEach(id -> {
DistributionStockArticleEntity distributionStockArticleEntity = this.baseMapper.selectById(id);
DistributionStockArticleVO distributionStockArticleVO = Func.copy(distributionStockArticleEntity, DistributionStockArticleVO.class);
distributionStockArticleEntityList.add(distributionStockArticleVO);
// DistributionStockArticleVO distributionStockArticleVO = Func.copy(distributionStockArticleEntity, DistributionStockArticleVO.class);
distributionStockArticleEntityList.add(DistributionStockArticleWrapper.build().entityVO(distributionStockArticleEntity));
});

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
Unescape View File

@ -168,7 +168,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
//添加拆包记录
DistributionUnpackingDetailsEntity distributionUnpackingDetails= new DistributionUnpackingDetailsEntity();
distributionUnpackingDetails.setStockArticleId(Optional.ofNullable(one.getStockArticleId()).orElse(null));
distributionUnpackingDetails.setOrderSelfNumber(Optional.ofNullable(one.getOrderSelfNumbering()).orElse(null));
distributionUnpackingDetails.setOrderSelfNumber(Optional.ofNullable(one.getOrderCode()).orElse(null));
distributionUnpackingDetails.setItemName(Optional.ofNullable(one.getDescriptionGoods()).orElse(null));
distributionUnpackingDetails.setUnpackingQuantity(Optional.ofNullable(one.getUnpackingQuantity()).orElse(null));
distributionUnpackingDetails.setStockListId(Optional.ofNullable(distributionStockListDTO.getId()).orElse(null));

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

@ -385,7 +385,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
queryWrapper.ne("order_self_numbering",orderSelfNumbering);
}
List<DistributionParcelListEntity> list = distributionParcelListService.list(queryWrapper);
vo.setOrderSelfNumbering(list.get(0).getOrderSelfNumbering());
vo.setOrderSelfNumbering(list.get(0).getOrderCode());
int pn = list.size();
vo.setPlanNum(pn);
planNum = planNum + pn;
@ -745,7 +745,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
//查询包件信息
List<DistributionParcelListEntity> list1 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
.eq(DistributionParcelListEntity::getStockArticleId, so.getStockArticleId())
.eq(DistributionParcelListEntity::getPacketBarCode, coding)
.eq(DistributionParcelListEntity::getOrderPackageCode, coding)
);
if(list1.size() > 0){
n.set(true);

3
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java
Unescape View File

@ -11,7 +11,7 @@ import java.util.Objects;
/**
* @program: LogisticsPlatform-Service
* @description:
* @description: 包件包装类
* @author: cyz
* @create: 2023-08-02 14:35
**/
@ -27,6 +27,7 @@ public class DistributionParcelListWrapper extends BaseEntityWrapper<Distributio
DistributionParcelListVO parcelListVO = Objects.requireNonNull(BeanUtil.copy(entity,DistributionParcelListVO.class));
parcelListVO.setOrderPackageStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STATUS, entity.getOrderPackageStatus()));
parcelListVO.setOrderPackageFreezeStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_FREEZE_STATUS, entity.getOrderPackageFreezeStatus()));
return parcelListVO;
}
}

33
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionReservationWrapper.java
Unescape View File

@ -0,0 +1,33 @@
package com.logpm.distribution.wrapper;
import com.logpm.distribution.entity.DistributionReservationEntity;
import com.logpm.distribution.vo.DistributionReservationVO;
import org.springblade.common.constant.DictBizConstant;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.system.cache.DictBizCache;
import java.util.Objects;
/**
* @program: LogisticsPlatform-Service
* @description: 包件包装类
* @author: cyz
* @create: 2023-08-02 14:35
**/
public class DistributionReservationWrapper extends BaseEntityWrapper<DistributionReservationEntity, DistributionReservationVO> {
public static DistributionReservationWrapper build(){
return new DistributionReservationWrapper();
}
@Override
public DistributionReservationVO entityVO(DistributionReservationEntity entity) {
DistributionReservationVO reservationVO = Objects.requireNonNull(BeanUtil.copy(entity,DistributionReservationVO.class));
reservationVO.setPeriodOfTimeName(DictBizCache.getValue(DictBizConstant.PERIOD_OF_TIME,entity.getPeriodOfTime()));
return reservationVO;
}
}

8
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java
Unescape View File

@ -5,7 +5,9 @@ import com.logpm.distribution.vo.DistributionStockArticleVO;
import org.springblade.common.constant.DictBizConstant;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.system.cache.DictBizCache;
import org.springblade.system.feign.IUserClient;
import java.util.Date;
import java.util.Objects;
@ -25,6 +27,8 @@ public class DistributionStockArticleWrapper extends BaseEntityWrapper<Distribut
public DistributionStockArticleVO entityVO(DistributionStockArticleEntity entity) {
DistributionStockArticleVO distributionStockupVO = Objects.requireNonNull(BeanUtil.copy(entity, DistributionStockArticleVO.class));
IUserClient userCliient = SpringUtil.getBean(IUserClient.class);
//计算在库天数
long time1 = entity.getWarehouseEntryTime().getTime(); //入库
@ -50,8 +54,8 @@ public class DistributionStockArticleWrapper extends BaseEntityWrapper<Distribut
distributionStockupVO.setGroundingStatusName(DictBizCache.getValue(DictBizConstant.BASIC_GROUNDING, entity.getGroundingStatus()));
distributionStockupVO.setFreezeStatusName(DictBizCache.getValue(DictBizConstant.FREEZE_STATUS,entity.getFreezeStatus()));
distributionStockupVO.setReservationStatusName(DictBizCache.getValue(DictBizConstant.RESERVATION_STATUS,entity.getReservationStatus()));
distributionStockupVO.setStockupStatusName(DictBizCache.getValue(DictBizConstant.RESERVATION_STATUS,entity.getStockupStatus()));
distributionStockupVO.setStockupStatusName(DictBizCache.getValue(DictBizConstant.STOCKUP_STATUS,entity.getStockupStatus()));
distributionStockupVO.setCreateUserName(userCliient.userInfoById(distributionStockupVO.getCreateUser()).getData().getName());
return distributionStockupVO;
}

2
blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
Unescape View File

@ -367,7 +367,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
Date date = CommonUtil.StringToDate(operationTime);
distributionStockArticleEntity = new DistributionStockArticleEntity();
distributionStockArticleEntity.setOrderSelfNumbering(orderSelfNum);
distributionStockArticleEntity.setOrderCode(orderSelfNum);
// 其实是客户
distributionStockArticleEntity.setMallName(takeCompany);

2
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
Unescape View File

@ -201,7 +201,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
}
distributionStockListEntity.setUnpack(false);
// distributionStockListEntity.setStockArticleId(distributionParcelList.getStockArticleId()); //订单ID
distributionStockListEntity.setOrderSelfNumbering(warehousingEntryDTO.getOrderNumber()); //订单自编号
distributionStockListEntity.setOrderCode(warehousingEntryDTO.getOrderNumber()); //订单自编号
distributionStockListEntity.setIncomingBatch(warehousingEntryDTO.getReceiptBatch()); //入库批次号
// distributionStockListEntity.setServiceNumber("服务号"); //服务号
distributionStockListEntity.setDescriptionGoods(warehousingDetail.getProductName()); //货物名称

12
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
Unescape View File

@ -263,7 +263,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
distributionStockArticleEntity = new DistributionStockArticleEntity();
distributionStockArticleEntity.setServiceNumber(warehouseWaybill.getServiceNo());
distributionStockArticleEntity.setOrderSelfNumbering(waybillNo);
distributionStockArticleEntity.setOrderCode(waybillNo);
distributionStockArticleEntity.setMallName(warehouseWaybill.getConsigneeName());
distributionStockArticleEntity.setMallId(warehouseWaybill.getConsigneeId());
distributionStockArticleEntity.setDescriptionGoods(warehouseWaybill.getGoodsName());
@ -342,7 +342,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
log.info("###########splitOrder: 开始拆单 ");
Long articleId = distributionStockArticleEntity.getId();
Integer handQuantity = distributionStockArticleEntity.getHandQuantity();
String orderSelfNum = distributionStockArticleEntity.getOrderSelfNumbering();
String orderSelfNum = distributionStockArticleEntity.getOrderCode();
List<ProductDTO> submitList = new ArrayList<>();
List<DistributionStockArticleEntity> articleList = distributionStockArticleClient.likeOrderSelfNumbering(orderSelfNum);
int size = articleList.size();
@ -350,7 +350,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
SplitOrderDTO splitOrderDTO = splitOrderDTOList.get(i);
DistributionStockArticleEntity entity = new DistributionStockArticleEntity();
BeanUtil.copyProperties(distributionStockArticleEntity,entity);
entity.setOrderSelfNumbering(entity.getOrderSelfNumbering()+"-"+size);
entity.setOrderCode(entity.getOrderCode()+"-"+size);
entity.setCustomerName(splitOrderDTO.getCustomerPerson());
entity.setCustomerTelephone(splitOrderDTO.getCustomerMobile());
entity.setCustomerAddress(splitOrderDTO.getCustomerAddress());
@ -391,14 +391,14 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
entity.setDeliveryQuantity(0);
entity.setTransferQuantity(0);
entity.setSigninQuantity(0);
entity.setGroundingStatus(0);
entity.setGroundingStatus(0+"");
entity.setIsOpai(1);
entity.setAvailableQuantity(allNum);
entity.setCreateUser(null);
entity.setCreateDept(null);
entity.setUpdateUser(null);
entity.setInventoryPersonId(null);
entity.setFreezeStatus(0);
entity.setFreezeStatus(0+"");
entity.setId(null);
Long aLong = distributionStockArticleClient.addData(entity);
if(aLong == 0){
@ -420,7 +420,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
}
distributionStockArticleEntity.setHandQuantity(handQuantity-allNum);
distributionStockArticleClient.submitHandQuantity(allNum,articleId);
String orderSelfNumbering = distributionStockArticleEntity.getOrderSelfNumbering();
String orderSelfNumbering = distributionStockArticleEntity.getOrderCode();
warehouseWaybillMapper.submitStockCount(orderSelfNumbering,allNum);
//删除主订单包件对应数据
for (ProductDTO productDTO:submitList){

Write Preview
Loading…
Cancel
Save