diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java index 73219ae6b..577ce5f51 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java @@ -139,7 +139,7 @@ public class DistributionDeliveryListEntity extends TenantEntity { * 配送状态;1-配送中,2-已完成 */ @ApiModelProperty(value = "配送状态;1-配送中,2-已完成") - private String deliveryState; + private String deliveryStatus; /** * 配送客户数 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java index 6870d30b4..ac7837337 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java @@ -19,16 +19,16 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.math.BigDecimal; -import java.util.Map; - +import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; +import java.math.BigDecimal; +import java.util.Date; +import java.util.Map; + /** * 提货单 实体类 * @@ -193,5 +193,9 @@ public class DistrilbutionBillLadingEntity extends TenantEntity { @ApiModelProperty(value = "备货人") private String goodsAreaId; + @ApiModelProperty(value = "提货状态") + private String conditions; //提货状态 + + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java index 6b1aa4ca7..d78df65f6 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java @@ -19,7 +19,6 @@ package com.logpm.distribution.vo; import com.fasterxml.jackson.annotation.JsonFormat; import com.logpm.distribution.entity.DistributionDeliveryInfoEntity; import io.swagger.annotations.ApiModelProperty; -import org.springblade.core.tool.node.INode; import lombok.Data; import lombok.EqualsAndHashCode; @@ -73,7 +72,7 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity { * 包条码 */ @ApiModelProperty(value = "包条码") - private String packetBarCode; + private String orderPackageCode; /** * 物品名称 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStockarticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStockarticleVO.java index 8347c3447..f8877bf19 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStockarticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStockarticleVO.java @@ -20,7 +20,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.logpm.distribution.entity.DistributionReservationStockarticleEntity; import io.swagger.annotations.ApiModelProperty; -import org.springblade.core.tool.node.INode; import lombok.Data; import lombok.EqualsAndHashCode; @@ -72,7 +71,7 @@ public class DistributionReservationStockarticleVO extends DistributionReservati * 订单自编号 */ @ApiModelProperty(value = "订单自编号") - private String orderSelfNumbering; + private String orderCode; /** * 门店id diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java index 09a9a337a..6460f08a3 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java @@ -18,7 +18,6 @@ package com.logpm.distribution.vo; import com.logpm.distribution.entity.DistributionDeliveryChargeEntity; import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; -import org.springblade.core.tool.node.INode; import lombok.Data; import lombok.EqualsAndHashCode; @@ -46,7 +45,6 @@ public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity { private String totalNumber; private String brand; private String typeService; - private String condition; //提货状态 private String conditionName; //提货状态 private String typeServiceName; private String transport; //搬运 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java index e370d8849..92aeefb62 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java @@ -16,43 +16,41 @@ */ 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.DistrilbutionBillLadingDTO; -import com.logpm.distribution.entity.DistributionStockupEntity; -import com.logpm.distribution.vo.DistributionStockupVO; +import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; +import com.logpm.distribution.excel.DistrilbutionBillLadingExcel; +import com.logpm.distribution.service.IDistrilbutionBillLadingService; import com.logpm.distribution.vo.DistrilbutionBillLadingDetailsVO; import com.logpm.distribution.vo.DistrilbutionBillLadingOwnVO; +import com.logpm.distribution.vo.DistrilbutionBillLadingVO; import com.logpm.distribution.wrapper.DistrilbutionBillLadingWrapper; 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.springblade.core.tool.utils.ObjectUtil; import org.springblade.system.entity.DictBiz; import org.springblade.system.feign.IDictBizClient; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; -import com.logpm.distribution.vo.DistrilbutionBillLadingVO; -import com.logpm.distribution.excel.DistrilbutionBillLadingExcel; -import com.logpm.distribution.service.IDistrilbutionBillLadingService; -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 javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.util.List; +import java.util.Map; import java.util.Objects; -import javax.servlet.http.HttpServletResponse; /** * 提货单 控制器 @@ -115,7 +113,7 @@ public class DistrilbutionBillLadingController extends BladeController { if(Func.isNotEmpty(typeService)){ DictBiz dictBiz = distribution_type.getData().get(Integer.parseInt(typeService) -1); i.setTypeServiceName(dictBiz.getDictValue()); - switch (Integer.parseInt(i.getCondition())){ + switch (Integer.parseInt(i.getConditions())){ case 1: i.setConditionName("未通知"); break; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index 009995f9b..dbc6e0688 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -90,7 +90,7 @@ SELECT ldpl.warehouse warehouse, ldpl.conditions conditions, - ldpl.packet_bar_code packetBarCode, + ldpl.order_package_code orderPackageCode, ldpl.goods_allocation goodsAllocation, ldpl.pallet pallet, ldpl.firsts firsts, diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index fba5d059f..d2ce66a34 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -47,7 +47,7 @@ WHERE ldl.package_id = #{id} and lddl.loading_time is null - UPDATE logpm_distribution_delivery_list lddl SET lddl.loading_time = now(),lddl.delivery_state =2 WHERE lddl.id = #{id} and lddl.loading_time is null + UPDATE logpm_distribution_delivery_list lddl SET lddl.loading_time = now(),lddl.delivery_status =2 WHERE lddl.id = #{id} and lddl.loading_time is null @@ -135,8 +135,8 @@ and lddl.type = #{param.type} - - and lddl.state = #{param.state} + + and lddl.delivery_status = #{param.deliveryStatus} and date_format(lddl.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%') @@ -233,7 +233,7 @@ and lddl.distribution_company = #{param.distributionCompany} - and lddl.delivery_status = #{param.state} + and lddl.delivery_status = #{param.deliveryStatus} and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%') @@ -269,8 +269,8 @@ and lddl.distribution_company = #{param.distributionCompany} - - and lddl.state = #{param.state} + + and lddl.delivery_status = #{param.deliveryStatus} and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%') @@ -308,8 +308,8 @@ and lddl.distribution_company = #{param.distributionCompany} - - and lddl.state = #{param.state} + + and lddl.delivery_status = #{param.deliveryStatus} and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%') @@ -557,7 +557,7 @@ lddl.driver_name driverName, lddl.vehicle_id vehicleId, lddl.driver_id driverId, - lddl.state state, + lddl.delivery_status deliveryStatus, lddl.preparation_time preparationTime, -- lddl.distribution_company distributionCompany, -- lddl.state state, @@ -657,7 +657,7 @@ and lddl.distribution_company = #{param.distributionCompany} - and lddl.delivery_status = #{param.state} + and lddl.delivery_status = #{param.deliveryStatus} and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%') diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index e5e719df9..7a1303ec5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -29,7 +29,7 @@ select dbl.id,dsa.service_number serviceNumber,dsa.waybill_number waybillNumber,dsa.consignee_unit consigneeUnit,dsa.customer_name customerName,dsa.customer_telephone customerTelephone,dsa.warehouse,dsa.warehouse_entry_time warehouseEntryTime,dsa.storage_fee storageFee,dsa.total_number totalNumber, - dsa.brand,dsa.type_service typeService,dbl.pick_up_time,dbl.consignee,dbl.delivery_document,dbl.condition + dsa.brand,dsa.type_service typeService,dbl.pick_up_time,dbl.consignee,dbl.delivery_document,dbl.conditions from logpm_distrilbution_bill_lading dbl LEFT JOIN logpm_distribution_stock_article dsa on dbl.stock_article_id = dsa.id diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 05426703f..7a59a6f1b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -35,7 +35,6 @@ import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.apache.commons.lang.StringUtils; import org.springblade.common.constant.delivery.DeliveryStatusConstant; -import org.springblade.common.constant.reservation.ReservationStatusConstant; import org.springblade.common.constant.reservation.ReservationStockupStatusConstant; import org.springblade.common.serviceConstant.ServiceConstant; import org.springblade.core.mp.base.BaseServiceImpl; @@ -263,7 +262,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl().lambda() .eq(DistributionDeliveryListEntity::getId, distributionDeliveryList.getId()) - .set(DistributionDeliveryListEntity::getDeliveryState, DeliveryStatusConstant.peisongzhong.getValue()) + .set(DistributionDeliveryListEntity::getDeliveryStatus, DeliveryStatusConstant.peisongzhong.getValue()) ); } @@ -1039,7 +1038,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl().lambda() .eq(DistributionDeliverySelfEntity::getDeliveryId, distributionAppDeliveryListVO.getId()) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index 7bf9501b3..da49c922b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -30,9 +30,7 @@ import com.logpm.distribution.vo.*; import org.springblade.common.constant.DistributionTypeConstant; import org.springblade.common.constant.delivery.DeliveryStatusConstant; 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.reservation.ReservationDeliveryTypeConstant; import org.springblade.common.constant.reservation.ReservationStatusConstant; import org.springblade.common.constant.reservation.ReservationStockupStatusConstant; @@ -660,7 +658,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl stockArticle = allocationDTO.getStockArticle(); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 6c9835471..f21045bab 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -16,33 +16,29 @@ */ package com.logpm.distribution.service.impl; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper; -import com.logpm.distribution.dto.DistributionLoadscanDTO; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.dto.DistributionSignforDTO; import com.logpm.distribution.dto.DistrilbutionAppsignforDTO; import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO; import com.logpm.distribution.entity.*; -import com.logpm.distribution.mapper.*; -import com.logpm.distribution.vo.DistributionLoadscanordVO; -import com.logpm.distribution.vo.DistributionSignforVO; import com.logpm.distribution.excel.DistributionSignforExcel; +import com.logpm.distribution.mapper.*; import com.logpm.distribution.service.IDistributionSignforService; +import com.logpm.distribution.vo.DistributionSignforVO; import com.logpm.distribution.vo.DistributionSignforsnmbVO; -import com.logpm.distribution.vo.DistributionstatisticsnmbVO; import com.logpm.distribution.vo.app.*; import lombok.AllArgsConstructor; import org.apache.commons.lang.StringUtils; +import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; 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 java.text.SimpleDateFormat; import java.util.ArrayList; @@ -393,7 +389,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl().lambda() .eq(DistributionDeliverySelfEntity::getDeliveryId, distributionAppDeliveryListVO.getId()) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockServiceImpl.java index d0e6f306e..fc2ce47ee 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockServiceImpl.java @@ -118,6 +118,7 @@ public class DistributionStockServiceImpl extends BaseServiceImpl