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

修改备货查询

training
caoyizhong 2 years ago
parent
e3416a205b
commit
bcd780b86c
6 changed files with 129 additions and 8 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. 5
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java
  2. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionBillLadingDTO.java
  3. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
  4. 39
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
  5. 84
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
  6. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

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

@ -187,6 +187,11 @@ public class DistributionStockupEntity extends TenantEntity {
*/
@ApiModelProperty(value = "取消原因")
private String annulment;
/**
* 备货编号
*/
@ApiModelProperty(value = "备货编号")
private String stockupCode;

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionBillLadingDTO.java
Unescape View File

@ -121,6 +121,10 @@ public class DistrilbutionBillLadingDTO extends DistrilbutionBillLadingEntity {
* 订单Id
*/
private String stockArticleId;
/**
* 备货编码
*/
private String stockupCode;
/**
* 库存品
*/

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

@ -106,7 +106,7 @@
group by ldpl.pallet
</select>
<select id="getParcelListOwn" resultType="com.logpm.distribution.vo.DistributionParcelListVO">
select DISTINCT ldpl.id, ldpl.order_package_code packetBarCode, ldpl.firsts ,ldpl.second ,ldpl.third_product thirdProduct,ldpl.material_name materialName,
select DISTINCT ldpl.id, ldpl.order_package_code orderPackageCode, 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

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

@ -45,7 +45,7 @@
select lds.id,lds.stockup_date stockupDate, lds.stockup_user stockupUser, lds.stockup_status stockupStatus, lds.stockup_area stockupArea,
lds.assign_status assignStatus, lds.stockip_allocation stockipAllocation, lds.goods_area_id goodsAreaId, lds.forklift_name forkliftName,
lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time fixTime,lds.assign_time assignTime,
lwga.headline,btg.group_name groupName,lds.type_service typeService,lds.outbound_date outboundDate
lwga.headline,btg.group_name groupName,lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode
from logpm_distribution_stockup lds
LEFT JOIN logpm_warehouse_goods_area lwga ON lds.stockup_area = lwga.id
LEFT JOIN logpm_basicdata_team_group btg ON lds.loader_id = btg.id
@ -54,13 +54,16 @@
<!-- lds.tenant_id = #{param.tenantId} -->
<if test="param.typeService != null and param.typeService != '' "> and lds.type_service = #{param.typeService}</if>
<if test="param.stockupDate != null "> and TO_DAYS(lds.stockup_date)=TO_DAYS( #{param.stockupDate})</if>
<if test="param.outboundDate != null "> and TO_DAYS(lds.outbound_date)=TO_DAYS( #{param.outboundDate})</if>
<if test="param.startDate != null "> and lds.stockup_date between #{param.startDate} and #{param.entDate}</if>
<if test="param.stockupUser != null and param.stockupUser != '' "> and lds.stockup_user = #{param.stockupUser}</if>
<if test="param.stockupUser != null and param.stockupUser != '' "> and lds.stockup_user like concat('%',#{param.stockupUser},'%')</if>
<if test="param.stockipAllocation != null and param.stockipAllocation != '' "> and lds.stockip_allocation like concat('%',#{param.stockipAllocation},'%')</if>
<if test="param.stockupCode != null and param.stockupCode != '' "> and lds.stockup_code like concat('%',#{param.stockupCode},'%') </if>
<if test="param.stockupStatus != null and param.stockupStatus != '' "> and lds.stockup_status = #{param.stockupStatus}</if>
<if test="param.stockupArea != null and param.stockupArea != '' "> and lds.stockup_area = #{param.stockupArea}</if>
<if test="param.assignStatus != null and param.assignStatus != '' "> and lds.assign_status = #{param.assignStatus}</if>
<if test="param.forkliftName != null and param.forkliftName != '' "> and lds.forklift_name = #{param.forkliftName}</if>
<if test="param.loaderName != null and param.loaderName != '' "> and lds.loader_name = #{param.loaderName}</if>
<if test="param.forkliftName != null and param.forkliftName != '' "> and lds.forklift_name like concat('%', #{param.forkliftName},'%')</if>
<if test="param.loaderName != null and param.loaderName != '' "> and lds.loader_name like concat('%', #{param.loaderName},'%')</if>
<if test="param.typeService != null and param.typeService != '' "> and lds.type_service = #{param.typeService}</if>
</where>
</select>
@ -162,7 +165,7 @@
</select>
<select id="getOneOwn" resultType="com.logpm.distribution.vo.DistributionStockupVO">
select DISTINCT ds.stockup_code stockupCode,ds.stockup_user stockupUser,ds.stockup_status stockupStatus,ldr.reservation_date reservationDate,ldr.serve_type serveType,ldr.delivery_way deliveryWay,
<!-- select DISTINCT ds.stockup_code stockupCode,ds.stockup_user stockupUser,ds.stockup_status stockupStatus,ldr.reservation_date reservationDate,ldr.serve_type serveType,ldr.delivery_way deliveryWay,
ldr.delivery_type deliveryType , lds.train_number trainNumber ,ds.stockup_area stockupArea
from logpm_distribution_reservation ldr
LEFT JOIN logpm_distribution_stockup_info dsi on ldr.id = dsi.reservation_id
@ -175,7 +178,31 @@
from logpm_distribution_stockup lds )
)
and ds.id = #{id}
</where>
</where>-->
SELECT
ds.stockup_code stockupCode,ds.stockup_user stockupUser,ds.stockup_status stockupStatus,
ds.stockup_area stockupArea, lds.train_number trainNumber,
ds.stockup_date reservationDate,
GROUP_CONCAT(DISTINCT ldr.serve_type SEPARATOR ',') AS serveType,
GROUP_CONCAT(DISTINCT ldr.delivery_way SEPARATOR ',') AS deliveryWay,
GROUP_CONCAT(DISTINCT ldr.delivery_type SEPARATOR ',') AS deliveryType
FROM
logpm_distribution_stockup ds
INNER JOIN
logpm_distribution_stockup_info ldsi ON ds.id = ldsi.stockup_id
INNER JOIN
logpm_distribution_reservation ldr ON ldr.id = ldsi.reservation_id
INNER JOIN
logpm_distribution_signfor lds on lds.reservation_id = ldr.id
WHERE
ds.id = #{id}
GROUP BY
ds.stockup_code,
lds.train_number,
ds.stockup_date,
ds.stockup_area;
</select>
<select id="detailReservationOwn" resultType="com.logpm.distribution.vo.DistributionStockupVO">
select DISTINCT ldr.consignee ,ldr.delivery_address deliveryAddress,ldr.delivery_phone deliveryPhone,ldr.mall_name mallName,

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

@ -23,6 +23,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
import com.logpm.distribution.dto.*;
import com.logpm.distribution.entity.*;
import com.logpm.distribution.excel.DistributionReservationExcel;
@ -38,7 +40,6 @@ import org.springblade.common.constant.delivery.DeliveryStatusConstant;
import org.springblade.common.constant.order.OrderReservationStatusConstant;
import org.springblade.common.constant.orderpackage.OrderPackageFreezeStatusConstant;
import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant;
import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
import org.springblade.common.constant.orderpackage.OrderPackageStockupStatusConstant;
import org.springblade.common.constant.reservation.*;
import org.springblade.common.constant.signing.SignforStatusConstant;
@ -47,11 +48,13 @@ import org.springblade.common.constant.stockup.StockupStatusConstant;
import org.springblade.common.serviceConstant.ServiceConstant;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.core.tool.utils.RandomType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
@ -139,6 +142,13 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
@Autowired
private IDistributionSignforService distributionSignforService;
@Autowired
private IBasicdataWarehouseClient basicdataWarehouseClient;
@Autowired
private BladeRedis bladeRedis;
@Override
@ -368,6 +378,72 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
distributionReservationMapper.updateById(reservationEntity);
return true;
}
public String bianMa(){
// String code ="BH";
StringBuilder sb = new StringBuilder();
sb.append("BH");
BladeUser user = AuthUtil.getUser();
SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
String format1 = format.format(new Date());
BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getWarehouseByDepartment(user.getDeptId());
if(ObjectUtil.isNotEmpty(warehouseByDepartment)){
sb.append(warehouseByDepartment.getWarehouseCode());
sb.append(format1);
String s = "BH" + warehouseByDepartment.getWarehouseCode();
String s1 = jiShuan(s);
sb.append(s1);
}else{
sb.append("00000");
sb.append(format1);
String s = "BH" + "00000";
String s1 = jiShuan(s);
sb.append(s1);
}
return sb.toString();
}
private String jiShuan(String s) {
String n = "00001";
if(Func.notNull(bladeRedis.get(s))){
Object o1 = bladeRedis.get(s);
int anInt = Integer.parseInt(String.valueOf(o1));
if (anInt < 10) {
if(anInt + 1 == 10){
n = String.format("000%d", anInt + 1);
}else{
n = String.format("0000%d", anInt + 1);
}
} else if (anInt < 100) {
if(anInt + 1 == 100){
n = String.format("00%d", anInt + 1);
}else{
n = String.format("000%d", anInt + 1);
}
} else if (anInt < 1000) {
if(anInt + 1 == 1000){
n = String.format("0%d", anInt + 1);
}else{
n = String.format("00%d", anInt + 1);
}
} else if (anInt < 10000) {
if(anInt + 1 == 10000){
n = String.format("%d", anInt + 1);
}else{
n = String.format("0%d", anInt + 1);
}
}else {
n = String.valueOf(anInt + 1);
}
bladeRedis.set(s,n);
return n;
}else{
bladeRedis.set(s,n);
return n;
}
}
@Transactional
@ -392,6 +468,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
stockupEntity.setStockupUser(user.getUserName());
stockupEntity.setStockupArea(stockupAreaName);
stockupEntity.setGoodsAreaId(Long.parseLong(goddsAreaId));
//编码生成规则 BH+仓库编码+年月日+序号00001
stockupEntity.setStockupCode(bianMa());
//设置备货任务指派状态---未指派
stockupEntity.setAssignStatus(StockAssignStatusConstant.weizhipai.getValue());
//设置备货任务状态---未备货
@ -538,6 +616,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
distributionStockupEntity.setStockupUser(user.getUserName());
distributionStockupEntity.setStockupUserId(user.getUserId());
distributionStockupEntity.setTypeService(DistributionTypeConstant.shipie.getValue());
//编码生成规则 BH+仓库编码+年月日+序号00001
distributionStockupEntity.setStockupCode(bianMa());
distributionStockupService.save(distributionStockupEntity);
}
HashSet<String> warehouseNames = new HashSet<>();
@ -954,6 +1034,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
stockupEntity.setOutboundDate(stockup.getOutboundDate());
stockupEntity.setTeamResponsibility(stockup.getLoadAndUnload());
stockupEntity.setStockupDate(stockup.getStockupDate());
//编码生成规则 BH+仓库编码+年月日+序号00001
stockupEntity.setStockupCode(bianMa());
//设置类型为商配
stockupEntity.setTypeService(DistributionTypeConstant.shangpei.getValue());
//2、添加备货任务

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

@ -76,6 +76,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
private final IDistributionDeliveryDetailsService distributionDeliveryDetailsService;
private final DistributionReservationServiceImpl distributionReservationService;
private final IDistributionPrintService distributionPrintService;
private final IDistributionStockArticleService distributionStockArticleService;
@ -259,6 +261,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
distrilbutionBillLading.setAssignStatus(StockAssignStatusConstant.weizhipai.getValue());
distrilbutionBillLading.setStockupStatus(StockupStatusConstant.weibeihuo.getValue());
distrilbutionBillLading.setConsignee("1");
distrilbutionBillLading.setStockupCode(distributionReservationService.bianMa());
this.save(distrilbutionBillLading);
//修改订单状态

Write Preview
Loading…
Cancel
Save