32 changed files with 672 additions and 54 deletions
@ -0,0 +1,60 @@
|
||||
package com.logpm.distribution.excel; |
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnore; |
||||
import com.alibaba.excel.annotation.ExcelProperty; |
||||
import com.alibaba.excel.annotation.write.style.ColumnWidth; |
||||
import com.alibaba.excel.annotation.write.style.ContentRowHeight; |
||||
import com.alibaba.excel.annotation.write.style.HeadRowHeight; |
||||
import lombok.Data; |
||||
|
||||
/* |
||||
* logisticsplatform-service |
||||
* @Author Diss |
||||
* @Create 2024/1/26 13:56 |
||||
*/ |
||||
@Data |
||||
@ColumnWidth(25) |
||||
@HeadRowHeight(20) |
||||
@ContentRowHeight(18) |
||||
public class DistributionBillInventoryExcel { |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("sku") |
||||
private String sku; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("物料名称") |
||||
private String descriptionGoods; |
||||
// @ColumnWidth(20)
|
||||
// @ExcelProperty("备货数")
|
||||
// private String quantity;
|
||||
@ColumnWidth(20) |
||||
@ExcelProperty("已备数量") |
||||
private String preparedQuantity; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("物料编号") |
||||
private String cargoNumber; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("应提件数") |
||||
private String quantity; //数量
|
||||
@ColumnWidth(20) |
||||
@ExcelProperty("备货状态") |
||||
private Integer stockStatus; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("提货件数") |
||||
private Integer pickUpQuantity; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("提货状态") |
||||
private Integer pickupStatus; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("单位") |
||||
private String cargoUnit; //单位
|
||||
/**@ColumnWidth(20) |
||||
@ExcelProperty("托盘码") |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("库位信息") |
||||
private String allocation; |
||||
|
||||
|
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,72 @@
|
||||
package com.logpm.distribution.excel; |
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnore; |
||||
import com.alibaba.excel.annotation.ExcelProperty; |
||||
import com.alibaba.excel.annotation.write.style.ColumnWidth; |
||||
import com.alibaba.excel.annotation.write.style.ContentRowHeight; |
||||
import com.alibaba.excel.annotation.write.style.HeadRowHeight; |
||||
import lombok.Data; |
||||
|
||||
/* |
||||
* logisticsplatform-service |
||||
* @Author Diss |
||||
* @Create 2024/1/26 11:06 |
||||
*/ |
||||
@Data |
||||
@ColumnWidth(25) |
||||
@HeadRowHeight(20) |
||||
@ContentRowHeight(18) |
||||
public class DistributionBillOrderExcel { |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("服务号") |
||||
private String serviceNumber; |
||||
@ExcelProperty("运单号") |
||||
private String waybillNumber; //运单号
|
||||
@ColumnWidth(20) |
||||
@ExcelProperty("客户车次号") |
||||
private String trainNumber; //客户车次号
|
||||
@ColumnWidth(20) |
||||
@ExcelProperty("始发仓") |
||||
private String sendWarehouseName; //始发仓
|
||||
@ColumnWidth(20) |
||||
@ExcelProperty("订单总数") |
||||
private String totalNumber; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("应提货件数") |
||||
private String handQuantity; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("提货件数") |
||||
private String pickUpQuantity; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("提货状态") |
||||
private String conditions; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("提货状态") |
||||
private String conditionsName; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("货物名称") |
||||
private String descriptionGoods; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("物料名称") |
||||
private String materialName; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("备货件数") //TODO 和应提货件数 值一样后期可能要改
|
||||
private String stockUpQuantity; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("已备数量") |
||||
private String preparedQuantity; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("备货状态") |
||||
private String stockupStatusName; |
||||
@ExcelIgnore |
||||
private String stockupStatus; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("托盘码") |
||||
private String pallet; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("货位信息") |
||||
private String goodsAllocation; |
||||
|
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,89 @@
|
||||
package com.logpm.distribution.excel; |
||||
/* |
||||
* logisticsplatform-service |
||||
* @Author Diss |
||||
* @Create 2024/1/26 11:52 |
||||
*/ |
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnore; |
||||
import com.alibaba.excel.annotation.ExcelProperty; |
||||
import com.alibaba.excel.annotation.write.style.ColumnWidth; |
||||
import com.alibaba.excel.annotation.write.style.ContentRowHeight; |
||||
import com.alibaba.excel.annotation.write.style.HeadRowHeight; |
||||
import lombok.Data; |
||||
|
||||
import java.util.Date; |
||||
@Data |
||||
@ColumnWidth(25) |
||||
@HeadRowHeight(20) |
||||
@ContentRowHeight(18) |
||||
public class DistributionBillOrderPackExcel { |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("服务号") |
||||
private String serviceNumber; //服务号
|
||||
@ColumnWidth(20) |
||||
@ExcelProperty("运单号") |
||||
private String waybillNumber; //运单号
|
||||
@ColumnWidth(20) |
||||
@ExcelProperty("包件码") |
||||
private String orderPackageCode; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("客户车次号") |
||||
private String trainNumber; //客户车次号
|
||||
@ColumnWidth(20) |
||||
@ExcelProperty("订单自编号") |
||||
private String orderCode; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("仓库") |
||||
private String sendWarehouseName; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("一级品类") |
||||
private String firsts; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("二级品类") |
||||
private String second; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("三级品类") |
||||
private String thirdProduct; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("物料编号") |
||||
private String materialCode; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("物料名称") |
||||
private String materialName; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("托盘码") |
||||
private String pallet; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("库位号") |
||||
private String goodsAllocation; |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("扫描人") |
||||
private String stockupCreateUser; //提货扫描人
|
||||
@ColumnWidth(20) |
||||
@ExcelProperty("扫描时间") |
||||
private String stockuppickUpTime; //提货时间
|
||||
//************************************
|
||||
@ExcelIgnore |
||||
private String orderPackageStatus; |
||||
@ExcelIgnore |
||||
private String warehouse; |
||||
@ExcelIgnore |
||||
private String stockupStatusName; //备货状态名称
|
||||
@ExcelIgnore |
||||
private String stockupConsignee; //提货人员
|
||||
@ExcelIgnore |
||||
private String stockupPickUpPlate; //提货车牌
|
||||
@ExcelIgnore |
||||
private String stockupConditions; //提货状态
|
||||
@ExcelIgnore |
||||
private String clerkCheck ; //文员复核人
|
||||
@ExcelIgnore |
||||
private Date signForCreateTime; //签收时间
|
||||
@ExcelIgnore |
||||
private Date clerkUpdateTime; //文员签收时间
|
||||
@ExcelIgnore |
||||
private Date stockupCreateTime; //备货时间名称
|
||||
@ExcelIgnore |
||||
private String outboundType; //服务类型
|
||||
} |
||||
@ -0,0 +1,73 @@
|
||||
package com.logpm.distribution.wrapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; |
||||
import com.logpm.distribution.entity.DistributionParcelListEntity; |
||||
import com.logpm.distribution.vo.DistributionParcelListVO; |
||||
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.text.SimpleDateFormat; |
||||
import java.util.Objects; |
||||
|
||||
/** |
||||
* @program: LogisticsPlatform-Service |
||||
* @description: 包件包装类 |
||||
* @author: cyz |
||||
* @create: 2023-08-02 14:35 |
||||
**/ |
||||
|
||||
public class DistributionParcelListVOWrapper extends BaseEntityWrapper<DistributionParcelListVO, DistributionParcelListVO> { |
||||
|
||||
// @Autowired
|
||||
// private IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient;
|
||||
|
||||
public static DistributionParcelListVOWrapper build(){ |
||||
return new DistributionParcelListVOWrapper(); |
||||
} |
||||
|
||||
@Override |
||||
public DistributionParcelListVO entityVO(DistributionParcelListVO entity) { |
||||
// IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient = SpringUtil.getBean(IWarehouseUpdownGoodsClient.class);
|
||||
// IWarehouseTrayGoodsClient warehouseTrayGoodsClient = SpringUtil.getBean(IWarehouseTrayGoodsClient.class);
|
||||
|
||||
|
||||
|
||||
DistributionParcelListVO parcelListVO = Objects.requireNonNull(BeanUtil.copy(entity,DistributionParcelListVO.class)); |
||||
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
||||
if(ObjectUtils.isNotNull(entity.getScanTimes())){ |
||||
parcelListVO.setScanTime(format.format(entity.getScanTimes())); |
||||
} |
||||
if(ObjectUtils.isNotNull(entity.getSigningTimes())){ |
||||
parcelListVO.setSigningTime(format.format(entity.getSigningTimes())); |
||||
} |
||||
parcelListVO.setOrderPackageStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STATUS, entity.getOrderPackageStatus())); |
||||
parcelListVO.setOrderPackageFreezeStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_FREEZE_STATUS, entity.getOrderPackageFreezeStatus())); |
||||
parcelListVO.setOrderPackageGroundingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_GROUNDING_STATUS, entity.getOrderPackageGroundingStatus())); |
||||
parcelListVO.setOrderPackageStockupStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STOCKUP_STATUS, entity.getOrderPackageStockupStatus())); |
||||
parcelListVO.setOrderPackageReservationStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_RESERVATION_STATUS, entity.getOrderPackageReservationStatus())); |
||||
parcelListVO.setOrderPackageLoadingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_LOADING_STATUS, entity.getOrderPackageLoadingStatus())); |
||||
parcelListVO.setTypeServiceName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, entity.getTypeService())); |
||||
//如果有上架选择填充货位信息
|
||||
// if (Func.isNotBlank(parcelListVO.getOrderPackageGroundingStatus())){
|
||||
// if (parcelListVO.getOrderPackageGroundingStatus().equals("20")){
|
||||
// if (Func.isNotEmpty(warehouseUpdownGoodsClient)){
|
||||
// String s = warehouseUpdownGoodsClient.selectMsgBywrap(parcelListVO.getId());
|
||||
// if (Func.isNotEmpty(s)){
|
||||
// parcelListVO.setAllocationMsg(s);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// if(Func.isNotEmpty(warehouseTrayGoodsClient)){
|
||||
// String s = warehouseUpdownGoodsClient.selectMsgBywrap(parcelListVO.getId());
|
||||
// if (Func.isNotEmpty(s)){
|
||||
// parcelListVO.setTrayMsg(s);
|
||||
// }
|
||||
// }
|
||||
|
||||
// parcelListVO.setOrderPackageReservationStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_FREEZE_STATUS, entity.getOrderPackageReservationStatus()));
|
||||
return parcelListVO; |
||||
} |
||||
} |
||||
Loading…
Reference in new issue