1288 changed files with 81301 additions and 14548 deletions
@ -0,0 +1,14 @@
|
||||
package org.springblade.common.annotations; |
||||
|
||||
import org.springframework.scheduling.annotation.Async; |
||||
|
||||
import java.lang.annotation.ElementType; |
||||
import java.lang.annotation.Retention; |
||||
import java.lang.annotation.RetentionPolicy; |
||||
import java.lang.annotation.Target; |
||||
|
||||
@Target({ElementType.TYPE, ElementType.METHOD}) |
||||
@Retention(RetentionPolicy.RUNTIME) |
||||
public @interface ChangeAsync { |
||||
String value() default ""; |
||||
} |
||||
@ -0,0 +1,22 @@
|
||||
package org.springblade.common.annotations; |
||||
|
||||
import java.lang.annotation.ElementType; |
||||
import java.lang.annotation.Retention; |
||||
import java.lang.annotation.RetentionPolicy; |
||||
import java.lang.annotation.Target; |
||||
|
||||
/** |
||||
* 特俗标记 |
||||
*/ |
||||
@Retention(RetentionPolicy.RUNTIME) |
||||
@Target({ ElementType.METHOD}) |
||||
public @interface LocalServerUser { |
||||
/**‘ |
||||
* 匹配值 |
||||
* factory:工厂系统 |
||||
* 6278683: 租户 |
||||
* factory-data: 租户 |
||||
* @return |
||||
*/ |
||||
String ds() default ""; |
||||
} |
||||
@ -0,0 +1,15 @@
|
||||
package org.springblade.common.annotations; |
||||
|
||||
import org.springframework.scheduling.annotation.Async; |
||||
|
||||
import java.lang.annotation.ElementType; |
||||
import java.lang.annotation.Retention; |
||||
import java.lang.annotation.RetentionPolicy; |
||||
import java.lang.annotation.Target; |
||||
|
||||
@Target({ElementType.TYPE, ElementType.METHOD}) |
||||
@Retention(RetentionPolicy.RUNTIME) |
||||
@Async("asyncExecutor") |
||||
public @interface LogpmAsync { |
||||
String value(); |
||||
} |
||||
@ -0,0 +1,11 @@
|
||||
package org.springblade.common.annotations; |
||||
|
||||
import java.lang.annotation.ElementType; |
||||
import java.lang.annotation.Retention; |
||||
import java.lang.annotation.RetentionPolicy; |
||||
import java.lang.annotation.Target; |
||||
|
||||
@Target({ElementType.METHOD}) |
||||
@Retention(RetentionPolicy.RUNTIME) |
||||
public @interface RepeatSubmit { |
||||
} |
||||
@ -0,0 +1,37 @@
|
||||
package org.springblade.common.component; |
||||
|
||||
import cn.hutool.http.HttpRequest; |
||||
import cn.hutool.http.HttpResponse; |
||||
import com.alibaba.fastjson.JSONObject; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springblade.common.constant.LauncherConstant; |
||||
import org.springframework.core.env.Environment; |
||||
import org.springframework.stereotype.Component; |
||||
|
||||
import java.util.HashMap; |
||||
import java.util.Map; |
||||
import java.util.Objects; |
||||
|
||||
@Component |
||||
@AllArgsConstructor |
||||
public class MockLoginService { |
||||
private final Environment environment; |
||||
public JSONObject mockToken(String tenantId,String account) { |
||||
String url = "http://" + LauncherConstant.loginAddr(Objects.requireNonNull(environment.getActiveProfiles()[0])) + "/blade-auth/oauth/token"; |
||||
HttpRequest urlRequest = HttpRequest.post(url); |
||||
// urlRequest.header("Authorization", "Basic c2FiZXI6c2FiZXJfc2VjcmV0");
|
||||
urlRequest.header("Authorization", "Basic bG9jYWw6bG9jYWxfc2VjcmV0"); |
||||
urlRequest.header("Tenant-Id", "627683"); |
||||
|
||||
Map<String, Object> params = new HashMap<>(); |
||||
params.put("grant_type", "local_server"); |
||||
params.put("scope", "all"); |
||||
params.put("username", account); |
||||
params.put("tenantId", tenantId); |
||||
HttpResponse execute = urlRequest.form(params).execute(); |
||||
String body = execute.body(); |
||||
JSONObject jsonObject = JSONObject.parseObject(body); |
||||
return jsonObject; |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,13 @@
|
||||
package org.springblade.common.constant; |
||||
|
||||
public class CommonBroadCastMqConstant { |
||||
|
||||
//--------------------开单交换机
|
||||
public static final String OPEN_WAYBILL_BROADCAST_EXCHANGE = "trunkline.openWaybill.broadcast.exchange"+ModuleNameConstant.DEVAUTH; |
||||
|
||||
public static final String OPEN_WAYBILL_BROADCAST_QUEUE = "open_waybill_broadcast_queue"+ModuleNameConstant.DEVAUTH; |
||||
public static final String UPDATE_WAYBILL_BROADCAST_QUEUE = "update_waybill_broadcast_queue"+ModuleNameConstant.DEVAUTH; |
||||
|
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,50 @@
|
||||
package org.springblade.common.constant; |
||||
|
||||
public enum WaybillStatusEnum { |
||||
|
||||
|
||||
BUFENRUKU("10", "部分入库"), |
||||
RUKU("20", "入库"), |
||||
BUFENZHONGZHUAN("30", "部分中转"), |
||||
ZHONGZHAUN("40", "中转"), |
||||
MUDICANGBUFENDAODA("50", "目的仓部分到达"), |
||||
MUDICANGDAODA("60", "目的仓到达"), |
||||
PEISOSNGBUFENZHUANGCHE("70", "配送部分装车"), |
||||
PEISONGZHUANGCHE("80", "配送装车"), |
||||
BUFENQIANSHOU("90", "部分签收"), |
||||
QIANSHOU("100", "已签收"); |
||||
|
||||
private String code; |
||||
private String value; |
||||
|
||||
public String getCode() { |
||||
return code; |
||||
} |
||||
|
||||
public void setCode(String code) { |
||||
this.code = code; |
||||
} |
||||
|
||||
public String getValue() { |
||||
return value; |
||||
} |
||||
|
||||
public void setValue(String value) { |
||||
this.value = value; |
||||
} |
||||
|
||||
WaybillStatusEnum(String code, String value) { |
||||
this.code = code; |
||||
this.value = value; |
||||
} |
||||
|
||||
public static String getValue(String code) { |
||||
for (WaybillStatusEnum value : WaybillStatusEnum.values()) { |
||||
if (value.getCode().equals(code)) { |
||||
return value.getValue(); |
||||
} |
||||
} |
||||
return null; |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,44 @@
|
||||
package org.springblade.common.constant.basiccode; |
||||
|
||||
import lombok.Data; |
||||
|
||||
/** |
||||
* 租户编码姐 |
||||
* 类型码表 |
||||
*/ |
||||
public enum BasicCodeShowConstant { |
||||
|
||||
/** |
||||
* 二维码 |
||||
*/ |
||||
QR_CODE("qr_code",1), |
||||
|
||||
/** |
||||
* 条形码 |
||||
*/ |
||||
BAR_CODE("bar_code",2); |
||||
|
||||
|
||||
/** |
||||
* 状态 |
||||
*/ |
||||
private String name; |
||||
|
||||
/** |
||||
* 值 |
||||
*/ |
||||
private Integer value; |
||||
|
||||
BasicCodeShowConstant(String name, Integer value) { |
||||
this.name = name; |
||||
this.value = value; |
||||
} |
||||
|
||||
public String getName() { |
||||
return name; |
||||
} |
||||
|
||||
public Integer getValue() { |
||||
return value; |
||||
} |
||||
} |
||||
@ -0,0 +1,68 @@
|
||||
package org.springblade.common.constant.basiccode; |
||||
|
||||
/** |
||||
* 租户编码姐 |
||||
* 类型码表 |
||||
*/ |
||||
public enum BasicCodeTypeConstant { |
||||
|
||||
|
||||
waybill_code("运单码","1"), |
||||
ORDER_CODE("订单码","2"), |
||||
ORDER_PACKAGE_CODE("包件码","3"), |
||||
// 仓库码
|
||||
WAREHOUSE_CODE("仓库码","4"), |
||||
// 货区码
|
||||
AREA_CODE("货区码","5"), |
||||
// 货架码
|
||||
SHELF_CODE("货架码","6"), |
||||
// 货位码
|
||||
POSITION_CODE("货位码","7"), |
||||
// 托盘码
|
||||
TRAY_CODE("托盘码","8"), |
||||
// 客户编码
|
||||
CLIENT_CODE("客户编码","9"), |
||||
// 提货单 配载计划 三方中转 直发商家签收单
|
||||
// 提货单码
|
||||
PICKUP_CODE("提货单码","10"), |
||||
// 配载计划码
|
||||
ALLOCATION_CODE("配载计划码","11"), |
||||
// 三方中转码
|
||||
THIRD_TRANSFER_CODE("三方中转码","12"), |
||||
// 直发商家签收单码
|
||||
DIRECT_SIGN_CODE("直发商家签收单码","13"), |
||||
|
||||
|
||||
//配送计划 自提单 预约单 备货码
|
||||
DELIVERY_PLAN_CODE("配送计划码","20"), |
||||
// 自提单码
|
||||
PICKUP_ORDER_CODE("自提单码","21"), |
||||
// 预约单码
|
||||
APPOINTMENT_CODE("预约单码","22"), |
||||
// 备货码
|
||||
STOCK_CODE("备货码","23"); |
||||
|
||||
|
||||
/** |
||||
* 状态 |
||||
*/ |
||||
private String name; |
||||
|
||||
/** |
||||
* 值 |
||||
*/ |
||||
private String value; |
||||
|
||||
BasicCodeTypeConstant(String name, String value) { |
||||
this.name = name; |
||||
this.value = value; |
||||
} |
||||
|
||||
public String getName() { |
||||
return name; |
||||
} |
||||
|
||||
public String getValue() { |
||||
return value; |
||||
} |
||||
} |
||||
@ -0,0 +1,177 @@
|
||||
package org.springblade.common.constant.broadcast; |
||||
|
||||
import org.springblade.common.constant.ModuleNameConstant; |
||||
|
||||
/** |
||||
* 广播常量 |
||||
*/ |
||||
public abstract class FanoutConstants { |
||||
|
||||
//干线
|
||||
public interface trunkline { |
||||
|
||||
//开单
|
||||
interface OPENWAYBILL{ |
||||
|
||||
//交换机
|
||||
String EXCHANGE = "fanout.trunkline.openWaybill" + ModuleNameConstant.DEVAUTH; |
||||
|
||||
interface QUEUE { |
||||
|
||||
String STATISTICSDATA_CREATEPACKAGEINFO = "fanout.trunkline.openWaybill.statisticsdata.createPackageinfo" + ModuleNameConstant.DEVAUTH; |
||||
// 开单检测数据 --商家端
|
||||
String SEND_BUSINESS_DATA_BY_OPENWAYBILL_DATA = "fanout.trunkline.openWaybill.send_business_data.open" + ModuleNameConstant.DEVAUTH; |
||||
// 改单数据 --商家端
|
||||
} |
||||
|
||||
} |
||||
|
||||
//改单
|
||||
interface UPDATEWAYBILL{ |
||||
|
||||
//交换机
|
||||
String EXCHANGE = "fanout.trunkline.updatewaybill" + ModuleNameConstant.DEVAUTH; |
||||
|
||||
interface QUEUE { |
||||
|
||||
String STATISTICSDATA_UPDATEPACKAGEINFO = "fanout.trunkline.updatewaybill.statisticsdata.updatePackageinfo" + ModuleNameConstant.DEVAUTH; |
||||
String SEND_BUSINESS_DATA_BY_UPDATEWAYBILL_DATA = "fanout.trunkline.openWaybill.send_business_data.update" + ModuleNameConstant.DEVAUTH; |
||||
|
||||
} |
||||
|
||||
} |
||||
|
||||
//包件日志
|
||||
interface PACKAGNODE{ |
||||
|
||||
//交换机
|
||||
String EXCHANGE = "fanout.trunkline.packagenode" + ModuleNameConstant.DEVAUTH; |
||||
|
||||
interface QUEUE { |
||||
|
||||
String PACKAGE_SIGN = "fanout.trunkline.packagenode.statisticsdata.packagesign" + ModuleNameConstant.DEVAUTH; |
||||
|
||||
String PACKAGE_INCOMING = "fanout.trunkline.packagenode.statisticsdata.packageincoming" + ModuleNameConstant.DEVAUTH; |
||||
|
||||
} |
||||
|
||||
} |
||||
|
||||
} |
||||
|
||||
|
||||
|
||||
//仓库
|
||||
public interface warehouse { |
||||
|
||||
|
||||
//打托
|
||||
interface TRAYTYPE{ |
||||
|
||||
//交换机
|
||||
String EXCHANGE = "fanout.warehouse.traytype" + ModuleNameConstant.DEVAUTH; |
||||
|
||||
interface QUEUE { |
||||
|
||||
String TRAYTYPE_MESSAGE = "fanout.warehouse.traytype.distribution.traytypemessage" + ModuleNameConstant.DEVAUTH; |
||||
|
||||
} |
||||
|
||||
} |
||||
|
||||
|
||||
// //解托
|
||||
// interface UNBINDTRAY{
|
||||
//
|
||||
// //交换机
|
||||
// String EXCHANGE = "fanout.warehouse.unbindtray" + ModuleNameConstant.DEVAUTH;
|
||||
//
|
||||
// interface QUEUE {
|
||||
//
|
||||
// String UNBINDTRAY_INFO = "fanout.warehouse.unbindtray.distribution.unbindtrayINFO" + ModuleNameConstant.DEVAUTH;
|
||||
//
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
//
|
||||
// //移托
|
||||
// interface MOVETRAY{
|
||||
//
|
||||
// //交换机
|
||||
// String EXCHANGE = "fanout.warehouse.movetray" + ModuleNameConstant.DEVAUTH;
|
||||
//
|
||||
// interface QUEUE {
|
||||
//
|
||||
// String MOVETRAY_INFO = "fanout.warehouse.movetray.distribution.movetrayInfo" + ModuleNameConstant.DEVAUTH;
|
||||
//
|
||||
// }
|
||||
//
|
||||
// }
|
||||
|
||||
|
||||
|
||||
//上架
|
||||
interface ALLOCATION{ |
||||
|
||||
//交换机
|
||||
String EXCHANGE = "fanout.warehouse.upshelf" + ModuleNameConstant.DEVAUTH; |
||||
|
||||
interface QUEUE { |
||||
|
||||
String ALLOCATION_MESSAGE = "fanout.warehouse.upshelf.distribution.allocationmessage" + ModuleNameConstant.DEVAUTH; |
||||
|
||||
} |
||||
|
||||
} |
||||
|
||||
|
||||
// //下架
|
||||
// interface DOWNSHELF{
|
||||
//
|
||||
// //交换机
|
||||
// String EXCHANGE = "fanout.warehouse.downshelf" + ModuleNameConstant.DEVAUTH;
|
||||
//
|
||||
// interface QUEUE {
|
||||
//
|
||||
// String DOWNSHELF_INFO = "fanout.warehouse.downshelf.distribution.downshelfInfo" + ModuleNameConstant.DEVAUTH;
|
||||
//
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
//
|
||||
// //移库
|
||||
// interface MOVEALLOCATION{
|
||||
//
|
||||
// //交换机
|
||||
// String EXCHANGE = "fanout.warehouse.moveallocation" + ModuleNameConstant.DEVAUTH;
|
||||
//
|
||||
// interface QUEUE {
|
||||
//
|
||||
// String MOVEALLOCATION_INFO = "fanout.warehouse.moveallocation.distribution.moveallocationInfo" + ModuleNameConstant.DEVAUTH;
|
||||
//
|
||||
// }
|
||||
//
|
||||
// }
|
||||
|
||||
|
||||
} |
||||
|
||||
/** |
||||
* 配送 |
||||
*/ |
||||
public interface distribution { |
||||
interface signfor{ |
||||
String EXCHANGE = "fanout.distribution.signfor" + ModuleNameConstant.DEVAUTH; |
||||
interface QUEUE { |
||||
String FACTORY_NODE_WORK_DISTRIBUTION_SIGNFOR_QUERY = "fanout.factory.nodework.distribution.signforquery"+ ModuleNameConstant.DEVAUTH; |
||||
} |
||||
} |
||||
|
||||
|
||||
} |
||||
|
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,46 @@
|
||||
package org.springblade.common.constant.loading; |
||||
|
||||
/** |
||||
* 订单冻结状态枚举 |
||||
* 对应码表 freeze_status |
||||
* @author pref |
||||
*/ |
||||
public enum LoadScanSigningTypeStatusConstant { |
||||
|
||||
sijiqianshou("司机扫描签收",1), |
||||
sijipiliangqianshou("司机批量签收",2), |
||||
wenyuanpiliangqianshou("文员批量签收",3); |
||||
|
||||
|
||||
/** |
||||
* 状态 |
||||
*/ |
||||
private String name; |
||||
|
||||
/** |
||||
* 值 |
||||
*/ |
||||
private Integer value; |
||||
|
||||
|
||||
private LoadScanSigningTypeStatusConstant(String name, Integer value) { |
||||
this.name = name; |
||||
this.value = value; |
||||
} |
||||
|
||||
public String getName() { |
||||
return name; |
||||
} |
||||
|
||||
public void setName(String name) { |
||||
this.name = name; |
||||
} |
||||
|
||||
public Integer getValue() { |
||||
return value; |
||||
} |
||||
|
||||
public void setValue(Integer value) { |
||||
this.value = value; |
||||
} |
||||
} |
||||
@ -0,0 +1,60 @@
|
||||
package org.springblade.common.model; |
||||
|
||||
import com.alibaba.fastjson.JSONObject; |
||||
|
||||
/** |
||||
* 节点作业数据传输对象 |
||||
*/ |
||||
public class BroadcastNodeData extends JSONObject { |
||||
|
||||
/** |
||||
* 当前作业租户ID |
||||
*/ |
||||
private String tenantId; |
||||
|
||||
/** |
||||
* 作业人名称 |
||||
*/ |
||||
private String userName; |
||||
|
||||
/** |
||||
* 操作时间 |
||||
*/ |
||||
private String operationTime; |
||||
|
||||
public String getTenantId() { |
||||
return tenantId; |
||||
} |
||||
|
||||
public void setTenantId(String tenantId) { |
||||
this.tenantId = tenantId; |
||||
} |
||||
|
||||
public String getUserName() { |
||||
return userName; |
||||
} |
||||
|
||||
public void setUserName(String userName) { |
||||
this.userName = userName; |
||||
} |
||||
|
||||
public String getOperationTime() { |
||||
return operationTime; |
||||
} |
||||
|
||||
public void setOperationTime(String operationTime) { |
||||
this.operationTime = operationTime; |
||||
} |
||||
|
||||
@Override |
||||
public String toJSONString() { |
||||
|
||||
|
||||
// 需要 将当前类的属性增加的到json的输出
|
||||
this.put("tenantId", tenantId); |
||||
this.put("userName", userName); |
||||
this.put("operationTime", operationTime); |
||||
|
||||
return super.toJSONString(); |
||||
} |
||||
} |
||||
@ -0,0 +1,14 @@
|
||||
package org.springblade.common.model; |
||||
|
||||
import lombok.Builder; |
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
@Builder |
||||
@Data |
||||
public class FanoutMsg implements Serializable { |
||||
|
||||
private String msg; |
||||
private String exchange; |
||||
} |
||||
@ -0,0 +1,30 @@
|
||||
package org.springblade.common.utils; |
||||
|
||||
import org.apache.logging.log4j.util.Strings; |
||||
|
||||
import java.util.Arrays; |
||||
import java.util.List; |
||||
import java.util.Objects; |
||||
import java.util.stream.Collectors; |
||||
|
||||
public class StringSplitUtil { |
||||
|
||||
|
||||
|
||||
public static List<String> StringSplitToList(String string) { |
||||
List<String> strs = null; |
||||
if (!Objects.isNull(string)) { |
||||
String str = string; |
||||
if (Strings.isNotBlank(str)) { |
||||
if (str.indexOf("，") > 0) { |
||||
//存在中文逗号
|
||||
str = str.replaceAll("，", ","); |
||||
} |
||||
strs = Arrays.stream(str.split(",")).collect(Collectors.toList()); |
||||
} |
||||
|
||||
} |
||||
return strs; |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,36 @@
|
||||
package org.springblade.common.wrapper; |
||||
|
||||
import org.springframework.http.HttpHeaders; |
||||
|
||||
import javax.servlet.http.HttpServletRequest; |
||||
import javax.servlet.http.HttpServletRequestWrapper; |
||||
import java.util.*; |
||||
|
||||
public class CustomHttpServletRequestWrapper extends HttpServletRequestWrapper { |
||||
|
||||
private final HttpHeaders headers; |
||||
|
||||
public CustomHttpServletRequestWrapper(HttpServletRequest request) { |
||||
super(request); |
||||
headers = new HttpHeaders(); |
||||
} |
||||
|
||||
@Override |
||||
public String getHeader(String name) { |
||||
String headerValue = headers.getFirst(name); |
||||
return headerValue != null ? headerValue : super.getHeader(name); |
||||
} |
||||
|
||||
@Override |
||||
public Enumeration<String> getHeaderNames() { |
||||
List<String> names = Collections.list(super.getHeaderNames()); |
||||
headers.forEach((key, value) -> names.add(key)); |
||||
return Collections.enumeration(names); |
||||
} |
||||
|
||||
// 其他需要覆盖的方法...
|
||||
|
||||
public void addHeader(String name, String value) { |
||||
headers.add(name, value); |
||||
} |
||||
} |
||||
@ -0,0 +1,28 @@
|
||||
package com.logpm.basic.vo; |
||||
|
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
/** |
||||
* 前端页面 表格字段保存对象 |
||||
*/ |
||||
@Data |
||||
@ApiModel(value = "TableSetVo", description = "表格设置对象") |
||||
public class TableSetVo implements Serializable { |
||||
|
||||
/** |
||||
* 表格key |
||||
*/ |
||||
@ApiModelProperty(value = "表格key") |
||||
private String tableKey; |
||||
|
||||
/** |
||||
* 表格表头设置内容 |
||||
*/ |
||||
@ApiModelProperty(value = "表格设置内容") |
||||
private String tableSetCongig; |
||||
|
||||
} |
||||
@ -0,0 +1,47 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basicdata.vo; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import com.logpm.basicdata.entity.BasicdataPriceEntity; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.tenant.mp.TenantEntity; |
||||
|
||||
import java.util.Date; |
||||
|
||||
/** |
||||
* 基础价格表 实体类 |
||||
* |
||||
* @author zqb |
||||
* @since 2024-04-02 |
||||
*/ |
||||
@Data |
||||
@ApiModel(value = "BasicdataPrice对象", description = "基础价格表") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class BasicdataPriceImportVO extends BasicdataPriceEntity { |
||||
|
||||
@ApiModelProperty(value = "客户名称") |
||||
private String clientName; |
||||
@ApiModelProperty(value = "客户编码") |
||||
private String clientCode; |
||||
@ApiModelProperty(value = "品牌名称") |
||||
private String brandName; |
||||
|
||||
} |
||||
@ -0,0 +1,50 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basicdata.vo; |
||||
|
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Builder; |
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
/** |
||||
* 基础价格按品类计费 视图实体类 |
||||
* |
||||
* @author zqb |
||||
* @since 2024-04-02 |
||||
*/ |
||||
@Builder |
||||
@Data |
||||
public class PriceDispatchAddClientVO implements Serializable { |
||||
|
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
@ApiModelProperty(value = "品类id") |
||||
private Long categoryId; |
||||
@ApiModelProperty(value = "分货费") |
||||
private Double sortPrice; |
||||
@ApiModelProperty(value = "装卸费") |
||||
private Double handlingPrice; |
||||
@ApiModelProperty(value = "平移费") |
||||
private Double relocationPrice; |
||||
@ApiModelProperty(value = "上楼费") |
||||
private Double upstairsDeliveryPrice; |
||||
@ApiModelProperty(value = "配送-上楼费免费楼层") |
||||
private Integer dispatchStairsCarryingCharge; |
||||
|
||||
} |
||||
@ -0,0 +1,18 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" |
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
||||
<modelVersion>4.0.0</modelVersion> |
||||
|
||||
<parent> |
||||
<groupId>org.springblade</groupId> |
||||
<artifactId>blade-service-api</artifactId> |
||||
<version>3.2.0.RELEASE</version> |
||||
</parent> |
||||
|
||||
<groupId>org.springblade</groupId> |
||||
<artifactId>logpm-business-api</artifactId> |
||||
<version>3.2.0.RELEASE</version> |
||||
|
||||
|
||||
</project> |
||||
@ -0,0 +1,12 @@
|
||||
package com.logpm.business.dto; |
||||
|
||||
import lombok.Data; |
||||
|
||||
@Data |
||||
public class BusinessPreListDTO { |
||||
|
||||
private String reservationCode; |
||||
|
||||
private Integer inWarehouse; |
||||
|
||||
} |
||||
@ -0,0 +1,12 @@
|
||||
package com.logpm.business.dto; |
||||
|
||||
import com.logpm.business.entity.BusinessPreOrderEntity; |
||||
|
||||
/** |
||||
* |
||||
*/ |
||||
public class BusinessPreOrderDTO extends BusinessPreOrderEntity { |
||||
|
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,33 @@
|
||||
package com.logpm.business.dto; |
||||
|
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import org.springframework.web.bind.annotation.RequestParam; |
||||
|
||||
@Data |
||||
public class BusinessSanDTO { |
||||
@ApiModelProperty(value = "配送车次") |
||||
private String distrCarNumber; |
||||
@ApiModelProperty(value = "包间码") |
||||
String orderPackageCode; |
||||
@ApiModelProperty(value = "预约单号") |
||||
String reservationCode; |
||||
@ApiModelProperty(value = "异常入库 0 正常 1 异常") |
||||
private Integer inWarehouseException; |
||||
|
||||
@ApiModelProperty(value = "仓库id") |
||||
private Long warehouseId;//仓库id
|
||||
|
||||
@ApiModelProperty(value = "仓库名称") |
||||
private String warehouseName;//仓库
|
||||
|
||||
@ApiModelProperty(value = "入库类型 1提货扫描入库 2直接入库 3批量入库 4 按车次号入库 5按订单入库") |
||||
private Integer incomingType;//入库类型 1提货扫描入库 2直接入库 3批量入库 4 按车次号入库 5按订单入库
|
||||
|
||||
@ApiModelProperty(value = "托盘码") |
||||
private String trayCode;//托盘码
|
||||
|
||||
@ApiModelProperty(value = "打托方式") |
||||
private String trayType;//打托方式
|
||||
|
||||
} |
||||
@ -0,0 +1,269 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.business.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import com.fasterxml.jackson.annotation.JsonFormat; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.tenant.mp.TenantEntity; |
||||
|
||||
import java.math.BigDecimal; |
||||
import java.util.Date; |
||||
|
||||
/** |
||||
* 商场转换预处理 实体类 |
||||
* |
||||
* @author cyz |
||||
* @since 2023-06-13 |
||||
*/ |
||||
@Data |
||||
@TableName("logpm_business_pre_order") |
||||
@ApiModel(value = "DistributionBusinessPreOrder对象", description = "商场转换预处理实体") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class BusinessPreOrderEntity extends TenantEntity { |
||||
|
||||
/** |
||||
* 预留1 |
||||
*/ |
||||
@ApiModelProperty(value = "预留1") |
||||
private String reserve1; |
||||
/** |
||||
* 预留2 |
||||
*/ |
||||
@ApiModelProperty(value = "预留2") |
||||
private String reserve2; |
||||
/** |
||||
* 预留3 |
||||
*/ |
||||
@ApiModelProperty(value = "预留3") |
||||
private String reserve3; |
||||
/** |
||||
* 预留4 |
||||
*/ |
||||
@ApiModelProperty(value = "预留4") |
||||
private String reserve4; |
||||
/** |
||||
* 预留5 |
||||
*/ |
||||
@ApiModelProperty(value = "预留5") |
||||
private String reserve5; |
||||
/** |
||||
* 订单自编号 |
||||
*/ |
||||
@ApiModelProperty(value = "订单自编号") |
||||
private String orderCode; |
||||
|
||||
|
||||
|
||||
/** |
||||
* 配送车牌 |
||||
*/ |
||||
@ApiModelProperty(value = "配送车牌") |
||||
private String vehicleName; |
||||
|
||||
|
||||
/** |
||||
* 配送司机 |
||||
*/ |
||||
@ApiModelProperty(value = "配送司机") |
||||
private String driverName; |
||||
|
||||
/** |
||||
* 仓库 |
||||
*/ |
||||
@ApiModelProperty(value = "仓库") |
||||
private String warehouse; |
||||
|
||||
@ApiModelProperty(value = "仓库ID") |
||||
private Long warehouseId; |
||||
/** |
||||
* 包件类型 1 定制品 2 库存品 3零担 |
||||
*/ |
||||
@ApiModelProperty(value = "状态") |
||||
private Integer conditions; |
||||
/** |
||||
* 包条码 |
||||
*/ |
||||
@ApiModelProperty(value = "包条码") |
||||
private String orderPackageCode; |
||||
|
||||
|
||||
/** |
||||
* 货位信息 |
||||
*/ |
||||
@ApiModelProperty(value = "货位信息") |
||||
private String goodsAllocation; |
||||
/** |
||||
* 所在托盘 |
||||
*/ |
||||
@ApiModelProperty(value = "所在托盘") |
||||
private String pallet; |
||||
/** |
||||
* 一级品 |
||||
*/ |
||||
@ApiModelProperty(value = "一级品") |
||||
private String firsts; |
||||
/** |
||||
* 二级品 |
||||
*/ |
||||
@ApiModelProperty(value = "二级品") |
||||
private String second; |
||||
/** |
||||
* 三级品 |
||||
*/ |
||||
@ApiModelProperty(value = "三级品") |
||||
private String thirdProduct; |
||||
/** |
||||
* 入库时间 |
||||
*/ |
||||
@ApiModelProperty(value = "入库时间") |
||||
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") |
||||
private Date warehouseEntryTimeEnd; |
||||
/** |
||||
* 运单号 |
||||
*/ |
||||
@ApiModelProperty(value = "运单号") |
||||
private String waybillNumber; |
||||
/** |
||||
* 运单ID |
||||
*/ |
||||
@ApiModelProperty(value = "运单ID") |
||||
private Long waybillId; |
||||
|
||||
/** |
||||
* 物料Id |
||||
*/ |
||||
@ApiModelProperty(value = "物料ID") |
||||
private Long materialId; |
||||
|
||||
/** |
||||
* 物料名称 |
||||
*/ |
||||
@ApiModelProperty(value = "物料名称") |
||||
private String materialName; |
||||
/** |
||||
* 物料编号 |
||||
*/ |
||||
@ApiModelProperty(value = "物料编号") |
||||
private String materialCode; |
||||
/** |
||||
* 物料单位 |
||||
*/ |
||||
@ApiModelProperty(value = "物料单位") |
||||
private String materialUnit; |
||||
/** |
||||
* 数量 |
||||
*/ |
||||
@ApiModelProperty(value = "数量") |
||||
private Integer quantity; |
||||
/** |
||||
* 车次号 |
||||
*/ |
||||
@ApiModelProperty(value = "车次号") |
||||
private String trainNumber; |
||||
/** |
||||
* 在库订单ID |
||||
*/ |
||||
@ApiModelProperty(value = "在库订单ID") |
||||
private Long stockArticleId; |
||||
|
||||
/** |
||||
* 服务号 |
||||
*/ |
||||
@ApiModelProperty(value = "服务号") |
||||
private String serviceNumber; |
||||
/** |
||||
* 品牌ID |
||||
*/ |
||||
@ApiModelProperty(value = "品牌ID") |
||||
private Long brandId; |
||||
/** |
||||
* 品牌名称 |
||||
*/ |
||||
@ApiModelProperty(value = "品牌名称") |
||||
private String brandName; |
||||
|
||||
/** |
||||
* 包件状态 |
||||
*/ |
||||
@ApiModelProperty(value = "包件状态") |
||||
private String orderPackageStatus; |
||||
|
||||
|
||||
|
||||
@ApiModelProperty(value = "经销商名称") |
||||
private String dealerName; |
||||
|
||||
@ApiModelProperty(value = "经销商编码") |
||||
private String dealerCode; |
||||
|
||||
@ApiModelProperty(value = "发站仓ID") |
||||
private Long sendWarehouseId; |
||||
|
||||
@ApiModelProperty(value = "发站仓ID") |
||||
private String sendWarehouseName; |
||||
|
||||
|
||||
@ApiModelProperty(value = "收站仓ID") |
||||
private Long acceptWarehouseId; |
||||
|
||||
@ApiModelProperty(value = "收站仓ID") |
||||
private String acceptWarehouseName; |
||||
|
||||
@ApiModelProperty(value = "装车状态") |
||||
private String orderPackageLoadingStatus; |
||||
|
||||
@ApiModelProperty(value = "重量") |
||||
private BigDecimal weight;//重量
|
||||
@ApiModelProperty(value = "体积") |
||||
private BigDecimal volume;//体积
|
||||
|
||||
@ApiModelProperty(value = "是否中转") |
||||
private Integer isTransfer;//是否中转
|
||||
|
||||
@ApiModelProperty(value = "暂存单id") |
||||
private Long advanceId;//暂存单id
|
||||
|
||||
@ApiModelProperty(value = "配送车次号") |
||||
private String distrCarNumber; |
||||
|
||||
@ApiModelProperty(value = "预约单号") |
||||
private String reservationCode; |
||||
|
||||
@ApiModelProperty(value = "是否入库 0 没有入库 1 已入库") |
||||
private Integer inWarehouse;//
|
||||
|
||||
@ApiModelProperty(value = "来源租户") |
||||
private String fromTenantId; |
||||
|
||||
|
||||
@ApiModelProperty(value = "操作状态 0 正常操作 1.补录操作") |
||||
private Integer operationStatus; |
||||
|
||||
@ApiModelProperty(value = "发车时间") |
||||
private String taskTime; |
||||
|
||||
// /**
|
||||
// * 配送状态
|
||||
// */
|
||||
// @ApiModelProperty(value = "配送状态")
|
||||
// private String orderPackageStatus;
|
||||
|
||||
} |
||||
@ -0,0 +1,28 @@
|
||||
package com.logpm.business.feign; |
||||
|
||||
import com.logpm.business.entity.BusinessPreOrderEntity; |
||||
import org.apache.ibatis.annotations.Param; |
||||
import org.springblade.common.constant.ModuleNameConstant; |
||||
import org.springframework.cloud.openfeign.FeignClient; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.PostMapping; |
||||
import org.springframework.web.bind.annotation.RequestBody; |
||||
import org.springframework.web.bind.annotation.RequestParam; |
||||
|
||||
import java.util.List; |
||||
|
||||
@FeignClient( |
||||
value = ModuleNameConstant.LOGPM_BUSINESS_NAME |
||||
) |
||||
public interface IBusinessPreOrderClient { |
||||
String API_PREFIX = "/client"; |
||||
String INORDERBYORDERPACKAGECODE = API_PREFIX + "/inOrderByOrderPackageCode"; |
||||
String SAVEOTHERDATABASENEW = API_PREFIX + "/saveOtherDataBaseNew"; |
||||
|
||||
@GetMapping(INORDERBYORDERPACKAGECODE) |
||||
Integer inOrderByOrderPackageCode(@RequestParam("orderPackageCode") String orderPackageCode, @RequestParam("carNum") String carNum); |
||||
|
||||
@PostMapping(SAVEOTHERDATABASENEW) |
||||
void saveOtherDataBaseNew(@RequestParam("userId") String tenantId, @RequestBody List<BusinessPreOrderEntity> dataResult, @RequestParam("mallName") String mallName); |
||||
|
||||
} |
||||
@ -0,0 +1,14 @@
|
||||
package com.logpm.business.vo; |
||||
|
||||
import com.logpm.business.entity.BusinessPreOrderEntity; |
||||
import lombok.Data; |
||||
|
||||
/** |
||||
* |
||||
*/ |
||||
@Data |
||||
public class BusinessPreOrderVO extends BusinessPreOrderEntity { |
||||
|
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,28 @@
|
||||
package com.logpm.business.vo; |
||||
|
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
|
||||
@Data |
||||
public class DistributionBusinessPreCarDetalPackageVO { |
||||
|
||||
@ApiModelProperty(value = "包条码") |
||||
private String orderPackageCode; |
||||
@ApiModelProperty(value = "一级品") |
||||
private String firsts; |
||||
@ApiModelProperty(value = "二级品") |
||||
private String second; |
||||
@ApiModelProperty(value = "三级品") |
||||
private String third_product; |
||||
@ApiModelProperty(value = "物料名称") |
||||
private String materialName; |
||||
@ApiModelProperty(value = "运单号") |
||||
private String waybillNumber; |
||||
@ApiModelProperty(value = "订单号") |
||||
private String orderCode; |
||||
@ApiModelProperty(value = "是否入库 0 没有入库 1 已入库") |
||||
private Integer inWarehouse; |
||||
@ApiModelProperty(value = "操作状态 0 正常操作 1.补录操作") |
||||
private Integer operationStatus; |
||||
|
||||
} |
||||
@ -0,0 +1,42 @@
|
||||
package com.logpm.business.vo; |
||||
|
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
|
||||
import java.util.List; |
||||
|
||||
@Data |
||||
public class DistributionBusinessPreCarDetalVO { |
||||
|
||||
|
||||
@ApiModelProperty(value = "配送车次") |
||||
private String distrCarNumber; |
||||
|
||||
|
||||
@ApiModelProperty(value = "配送司机") |
||||
private String driverName; |
||||
|
||||
@ApiModelProperty(value = "配送车辆") |
||||
private String vehicleName; |
||||
|
||||
@ApiModelProperty(value = "配送日期") |
||||
private String taskTime; |
||||
|
||||
@ApiModelProperty(value = "订单总数") |
||||
private Integer orderCount; |
||||
|
||||
@ApiModelProperty(value = "计划件数") |
||||
private Integer orderPackageCodeCount; |
||||
|
||||
@ApiModelProperty(value = "装车件数") |
||||
private Integer loadCarCount; |
||||
|
||||
@ApiModelProperty(value = "入库件数") |
||||
private Integer inWarehouseCount; |
||||
|
||||
@ApiModelProperty(value = "车次订单列表") |
||||
private List<DistributionBusinessPreCarOrderDetalVO> distributionBusinessPreCarOrderDetalVOList; |
||||
|
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,28 @@
|
||||
package com.logpm.business.vo; |
||||
|
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
|
||||
@Data |
||||
public class DistributionBusinessPreCarNumberVO { |
||||
|
||||
@ApiModelProperty(value = "配送车次") |
||||
private String distrCarNumber; |
||||
|
||||
@ApiModelProperty(value = "运单号") |
||||
private String waybillNumber; |
||||
|
||||
@ApiModelProperty(value = "订单号") |
||||
private String orderCode; |
||||
|
||||
|
||||
@ApiModelProperty(value = "总件数") |
||||
private Integer totalNum; |
||||
|
||||
@ApiModelProperty(value = "入库件数") |
||||
private Integer inNum; |
||||
|
||||
@ApiModelProperty(value = "待入库件数") |
||||
private Integer restNum; |
||||
|
||||
} |
||||
@ -0,0 +1,16 @@
|
||||
package com.logpm.business.vo; |
||||
|
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
|
||||
@Data |
||||
public class DistributionBusinessPreCarNumerPageQueryVO { |
||||
@ApiModelProperty(value = "开始时间") |
||||
private String taskTimeStart; |
||||
@ApiModelProperty(value = "结束时间") |
||||
private String taskTimeEnd; |
||||
@ApiModelProperty(value = "订单号") |
||||
private String orderCode; |
||||
@ApiModelProperty(value = "配送车次号") |
||||
private String distrCarNumber; |
||||
} |
||||
@ -0,0 +1,34 @@
|
||||
package com.logpm.business.vo; |
||||
|
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
|
||||
@Data |
||||
public class DistributionBusinessPreCarNumerPageVO { |
||||
@ApiModelProperty(value = "配送车次") |
||||
private String distrCarNumber; |
||||
|
||||
|
||||
@ApiModelProperty(value = "配送司机") |
||||
private String driverName; |
||||
|
||||
@ApiModelProperty(value = "配送车辆") |
||||
private String vehicleName; |
||||
|
||||
@ApiModelProperty(value = "配送日期") |
||||
private String taskTime; |
||||
|
||||
@ApiModelProperty(value = "订单总数") |
||||
private Integer orderCount; |
||||
|
||||
@ApiModelProperty(value = "计划件数") |
||||
private Integer orderPackageCodeCount; |
||||
|
||||
@ApiModelProperty(value = "装车件数") |
||||
private Integer loadCarCount; |
||||
|
||||
@ApiModelProperty(value = "入库件数") |
||||
private Integer inWarehouseCount; |
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,35 @@
|
||||
package com.logpm.business.vo; |
||||
|
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
|
||||
import java.util.List; |
||||
|
||||
@Data |
||||
public class DistributionBusinessPreCarOrderDetalVO { |
||||
/** |
||||
* 订单自编号 |
||||
*/ |
||||
@ApiModelProperty(value = "订单自编号") |
||||
private String orderCode; |
||||
/** |
||||
* 运单号 |
||||
*/ |
||||
@ApiModelProperty(value = "运单号") |
||||
private String waybillNumber; |
||||
|
||||
@ApiModelProperty(value = "计划件数") |
||||
private Integer orderPackageCodeCount; |
||||
|
||||
@ApiModelProperty(value = "装车件数") |
||||
private Integer loadCarCount; |
||||
|
||||
@ApiModelProperty(value = "入库件数") |
||||
private Integer inWarehouseCount; |
||||
|
||||
@ApiModelProperty(value = "异常入库件数") |
||||
private Integer inWarehouseExceCount; |
||||
|
||||
@ApiModelProperty(value = "包件列表") |
||||
private List<DistributionBusinessPreCarDetalPackageVO> distributionBusinessPreCarDetalPackageList; |
||||
} |
||||
@ -0,0 +1,28 @@
|
||||
package com.logpm.business.vo; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
import java.util.List; |
||||
|
||||
@Data |
||||
public class DistributionBusinessPreOrderListVO implements Serializable { |
||||
|
||||
/** |
||||
* 总数 |
||||
*/ |
||||
private Integer sumNum; |
||||
|
||||
|
||||
/** |
||||
* 入库数量 |
||||
*/ |
||||
private Integer inNum; |
||||
|
||||
/** |
||||
* 列表数据 |
||||
*/ |
||||
private List<BusinessPreOrderVO> list; |
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,19 @@
|
||||
package com.logpm.distribution.dto; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
import java.util.List; |
||||
import java.util.Set; |
||||
|
||||
@Data |
||||
public class FindParamterDTO implements Serializable { |
||||
|
||||
private Set<String> orderCodeSet; |
||||
|
||||
private Long warehouseId; |
||||
|
||||
private List<String> orderPackageCodeList; |
||||
private List<String> orderCodeList; |
||||
|
||||
} |
||||
@ -0,0 +1,14 @@
|
||||
package com.logpm.distribution.dto; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
import java.util.List; |
||||
|
||||
@Data |
||||
public class OrderPackageDTO implements Serializable { |
||||
|
||||
private List<String> strings; |
||||
|
||||
private Long warehouseId; |
||||
} |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue