I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
yun-zuoyi
钮海涛 5 years ago
parent f7c42ee90d ca0b92aa6a
commit 7286ce7ebb
44 changed files with 1738 additions and 42 deletions
Show Stats Download Patch File Download Diff File

21
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java
Unescape Escape View File

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
@ -38,4 +39,24 @@ public class AndonAlarmType extends BaseBean implements Serializable {
@ApiParam("安灯类型名称")
private String alarmName;
@Column(name = "CODE")
@ApiParam("菜单编号")
private String code;
@Column(name = "COLOR")
@ApiParam("BI颜色")
private String color;
@Column(name = "SEQ")
@ApiParam("顺序")
private Integer seq;
@Transient
@ApiParam("安灯类型代码")
private String value;
@Transient
@ApiParam("安灯类型名称")
private String description;
}

10
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java
Unescape Escape View File

@ -10,10 +10,7 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -81,4 +78,9 @@ public class AndonMessageRecord extends BaseBean implements Serializable {
@Column(name = "MEMO")
@ApiParam(value = "备注")
private String memo;
@Lob
@Column(name = "MESSAGE")
@ApiParam(value = "广播内容")
private String message;
}

12
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java
Unescape Escape View File

@ -96,4 +96,16 @@ public class AndonRouteStatus extends BaseBean implements Serializable {
@ApiParam("触发类型默认不需要外部触发")
private boolean checkTriggerTypeFalg = false;
@Transient
@ApiParam("组件执行完成根据业务设置下个触发事件，如果是外部告知下个触发事件则设置null，一个组件集执行完毕后这个值赋给CommonMsgModel的triggerEvent")
private String nextTriggerEvent;
@Transient
@ApiParam("默认继续执行下个组件，当组件集中一个组件根据业务需要跳出去进去下个状态点，则设置未false,同时配置下个状态点的触发事件nextTriggerEvent")
private boolean execNextModuleFlag = true;
@Transient
@ApiParam("默认异常未处理")
private boolean doErrorFlag = false;
}

14
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java
Unescape Escape View File

@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -64,4 +61,13 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl
@ApiParam(value = "安灯来源类型")
private String sourceType;
@Column(name = "CACHE_FLAG")
@ApiParam(value = "缓存标识")
private Integer cacheFlag;
@Lob
@Column(name = "CONTENT")
@ApiParam(value = "内容")
private String content;
}

2
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java
Unescape Escape View File

@ -31,6 +31,6 @@ public class AndonActionModuleGroupModel implements Serializable {
@ApiParam("流程组件参数集合")
private List<AndonRouteModuleParam> routeModuleParamList;
@ApiParam("区域流程组件参数集合")
@ApiParam("安灯流程组件参数集合")
private List<AndonAlarmRouteModuleParam> alarmRouteModuleParamList;
}

3
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java
Unescape Escape View File

@ -42,7 +42,4 @@ public class CommonMsgModel implements Serializable {
@ApiModelProperty("触发事件")
private String triggerEvent;
@ApiModelProperty("下个触发事件，一个组件集执行完毕后这个值赋给triggerEvent")
private String nextTriggerEvent;
}

1
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
Unescape Escape View File

@ -1175,7 +1175,6 @@ public class AndonEnumUtil {
}
}
/**
* ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测
*

115
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
Unescape Escape View File

@ -705,7 +705,8 @@ public class MesEnumUtil {
BOARD("BOARD", "看板类型"),
EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象");
EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
BH_PACKAGE_TYPE_VALUE("EQU_DEFECT_PHENOMENON", "B&H包装条码赋值样品类型值");
private String value;
private String description;
@ -6034,4 +6035,116 @@ public class MesEnumUtil {
}
}
/**
* 校枪状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CALIBRATION_STATUS {
UNEXECUTED(10, "UNEXECUTED", "待执行"),
EXECUTE(20, "EXECUTE", "执行中"),
CANCEL(30, "CANCEL", "取消"),
FINISH(40, "FINISH", "完成");
private int value;
private String code;
private String description;
CALIBRATION_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* 扭矩枪类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GUN_TYPE {
DL(10, "DL", "小枪"),
PF(20, "PF", "大枪");
private int value;
private String code;
private String description;
GUN_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
}

204
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
Unescape Escape View File

@ -369,8 +369,12 @@ public class MesPcnEnumUtil {
REPAIR("REPAIR", "处理措施"),
SCRAP("SCRAP", "报废原因"),
QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
WC_CHECK("WC_CHECK", "开线检查项");
WC_CHECK("WC_CHECK", "开线检查项"),
BOARD("BOARD", "看板类型"),
EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
BH_PACKAGE_TYPE_VALUE("EQU_DEFECT_PHENOMENON", "B&H包装条码赋值样品类型值");
private String value;
private String description;
@ -1812,8 +1816,8 @@ public class MesPcnEnumUtil {
BH_ORDER(40, "B&H工单"),
JIT_ORDER(50, "JIT工单"),
STOCK_ORDER(60, "库存工单"),
REPAIR(70,"返修插单"),
EMERGENCY_ORDER(80,"紧急插单");
REPAIR(70, "返修插单"),
EMERGENCY_ORDER(80, "紧急插单");
private int value;
private String description;
@ -2354,16 +2358,14 @@ public class MesPcnEnumUtil {
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRODUCE_SN_STATUS {
CREATE(10, "创建"),
PROCESS(20, "加工"),
OFFLINE(30, "下线"),
PACKAGE_SCAN(35, "打包扫描"),
INSTOCKED(40, "入库"),
SHIPING(50, "发运"),
SHIPPING(50, "发运"),
CLOSE(90, "关闭");
private int value;
@ -2550,7 +2552,10 @@ public class MesPcnEnumUtil {
BUTTON("button", "按钮"),
TABLES("tables", "多个表格"),
CUSTOM("custom", "定制页面"),
FORM("form", "文本按钮");
CUSTOM_DIALOG("custom_dialog", "定制弹窗"),
FORM("form", "文本按钮"),
SPEC_TEXT("spec_text", "工步弹框文本"),
SHOW_ASSEMB_TABLE("SHOW_ASSEMB_TABLE", "展示组件表格");
private String value;
private String description;
@ -3249,7 +3254,7 @@ public class MesPcnEnumUtil {
GREEN("green", "绿色"),
RED("red", "红色"),
YELLOW("Yellow", "黄色");
YELLOW("yellow", "黄色");
private String code;
private String description;
@ -3313,6 +3318,41 @@ public class MesPcnEnumUtil {
}
}
/**
* 散件IT生产队列状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SP_SHIPPING_STATUS {
CREATE(10, "创建"),
SHIPPED(20, "已发运");
private int value;
private String description;
SP_SHIPPING_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FSM_EVENT {
TRIGGER(10, "trigger", "触发"),
@ -3752,5 +3792,151 @@ public class MesPcnEnumUtil {
return tmp;
}
}
/**
* 界面类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WINDOW_TYPE {
BUTTON_CFG(10, "按钮组件"),
BOARD_BASE_WINDOW(20, "看板基础页面"),
STEP_WINDOW(30, "工步界面");
private int value;
private String description;
WINDOW_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 校枪状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CALIBRATION_STATUS {
UNEXECUTED(10, "UNEXECUTED", "待执行"),
EXECUTE(20, "EXECUTE", "执行中"),
CANCEL(30, "CANCEL", "取消"),
FINISH(40, "FINISH", "完成");
private int value;
private String code;
private String description;
CALIBRATION_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* 扭矩枪类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GUN_TYPE {
DL(10, "DL", "小枪"),
PF(20, "PF", "大枪");
private int value;
private String code;
private String description;
GUN_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
}

148
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -6971,6 +6971,154 @@ public class WmsEnumUtil {
}
/**
* 运费单审批状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum APPROVAL_STATUS {
APPROVE_PROCESSING(10, "APPROVE_PROCESSING", "审批中"),
APPROVE_COMPLETED(20, "APPROVE_COMPLETED", "已审批"),
APPROVE_REFUSE(30, "APPROVE_REFUSE", "审批拒绝");
private int value;
private String code;
private String description;
APPROVAL_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static APPROVAL_STATUS codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
* 运费单审批状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum NORMAL_ABNORMAL {
NORMAL(10, "NORMAL", "正常"),
ABNORMAL(20, "ABNORMAL", "非正常");
private int value;
private String code;
private String description;
NORMAL_ABNORMAL(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static NORMAL_ABNORMAL codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
* 产品条码事务类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java
Unescape Escape View File

@ -99,4 +99,8 @@ public class IfPackageDetail extends BaseBean implements Serializable {
@Column(name = "CT_NO")
@ApiParam("容器编号")
private String ctNo;
@Column(name = "SN_TYPE")
@ApiParam("条码类型")
private String snType;
}

18
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
Unescape Escape View File

@ -27,7 +27,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "if_queue_shipping")
@Table(name = "IF_QUEUE_SHIPPING")
@Api("JIT发运数据同步")
public class IfQueueShipping extends BaseBean implements Serializable {
private static final long serialVersionUID = -3385698810529084423L;
@ -105,4 +105,20 @@ public class IfQueueShipping extends BaseBean implements Serializable {
@ApiParam("接口代码")
private String ifCode;
@Column(name = "ITEM_PART_NO")
@ApiParam("原材料物料号")
private String itemPartNo;
@Column(name = "ITEM_PART_NAME")
@ApiParam("原材料物料名称")
private String itemPartName;
@Column(name = "ITEM_QTY")
@ApiParam("原材料物料用量")
private Double itemQty;
@Column(name = "ITEM_UNIT")
@ApiParam("原材料物料用量")
private String itemUnit;
}

81
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGunCalibrationRecord.java
Unescape Escape View File

@ -0,0 +1,81 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/5/27 2:20 下午
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_PACKAGE_DETAIL")
@Api("校枪记录表")
public class MesGunCalibrationRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -6166370020956801528L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "GUN_CODE")
@ApiParam("枪号")
private String gunCode;
@Column(name = "CUN_TYPE")
@ApiParam("扭矩枪类型")
private String cunType;
@Column(name = "PSET_CODE")
@ApiParam("PSET号")
private String psetCode;
@Column(name = "EXPECT_COUNT")
@ApiParam("设定枪数")
private Integer expectCount;
@Column(name = "REAL_COUNT")
@ApiParam("实际枪叔")
private Integer realCount;
@Column(name = "CALIBRATION_STATUS")
@ApiParam("校枪状态")
private Integer calibrationStatus;
@Column(name = "START_TIME")
@ApiParam("开始校枪时间")
private String startTime;
@Column(name = "END_TIME")
@ApiParam("结束校枪时间")
private String endTime;
@Transient
@ApiParam("校枪状态名称")
private String calibrationStatusName;
@Transient
@ApiParam("界面编号")
private String windowNo;
}

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
Unescape Escape View File

@ -110,6 +110,10 @@ public class MesPackage extends BaseBean implements Serializable {
@ApiParam("容器编号")
private String ctNo;
@Column(name = "SN_TYPE")
@ApiParam("条码类型")
private String snType;
public MesPackage() {
}

8
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java
Unescape Escape View File

@ -70,4 +70,12 @@ public class MesQueueShippingDetail extends BaseBean implements Serializable {
@Column(name = "qty")
@ApiParam("数量")
private Double qty;
@Column(name = "SEQ")
@ApiParam("队列明细序号")
private Double seq;
@Column(name = "PRODUCE_COLOR")
@ApiParam("产品颜色")
private Double produceColor;
}

8
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonBean.java
Unescape Escape View File

@ -1,12 +1,20 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ButtonBean implements Serializable {
private static final long serialVersionUID = -4012120630477190414L;
@ApiParam(value = "按钮代码")
private String buttonCode;

34
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SpQueueShippingModel.java
Unescape Escape View File

@ -0,0 +1,34 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesQueueShippingDetail;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2020/5/26 18:59
* @desc
*/
@Data
@Api("散件队列发运model")
public class SpQueueShippingModel {
@ApiParam("队列编号")
private String jitNo;
@ApiParam("vin")
private String vin;
@ApiParam("车号")
private String carNo;
@ApiParam("等级代码")
private String gradeCode;
@ApiParam("产品颜色")
private Double produceColor;
}

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
Unescape Escape View File

@ -132,6 +132,9 @@ public class StationRequestBean implements Serializable {
@ApiParam("客户工厂代码")
private String customerFactoryCode;
@ApiParam("工步弹框参数")
private String stepDialogParam;
@Override
public String toString() {
return "StationRequestBean{" +

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java
Unescape Escape View File

@ -52,4 +52,7 @@ public class StationResultBean<T> implements Serializable {
@ApiParam("多个数据集")
private List<StationResultBean<T>> stationResultBeans;
@ApiParam("定制页面名称")
private String customPageName;
}

13
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesGunCalibrationRecordRepository.java
Unescape Escape View File

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesGunCalibrationRecord;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/5/27 2:39 下午
* @Modify:
*/
public interface MesGunCalibrationRecordRepository extends BaseRepository<MesGunCalibrationRecord, Long> {
}

26
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -2887,4 +2887,30 @@ public class MesHqlPack {
getStringBuilderPack(details, result);
return result;
}
/**
* MES 校枪记录
*
* @param gunCalibrationRecord
* @return
*/
public static DdlPackBean getMesGunCalibrationRecord(MesGunCalibrationRecord gunCalibrationRecord, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(gunCalibrationRecord, organizeCode);
if (!StringUtils.isEmpty(gunCalibrationRecord.getWorkCellCode())) {
DdlPreparedPack.getStringEqualPack(gunCalibrationRecord.getWorkCellCode(), "workCellCode", packBean);
}
if (!StringUtils.isEmpty(gunCalibrationRecord.getGunCode())) {
DdlPreparedPack.getStringEqualPack(gunCalibrationRecord.getGunCode(), "gunCode", packBean);
}
if (gunCalibrationRecord.getCalibrationStatus() != null) {
DdlPreparedPack.getNumEqualPack(gunCalibrationRecord.getCalibrationStatus(), "calibrationStatus", packBean);
}
if (!StringUtils.isEmpty(gunCalibrationRecord.getStartTime())) {
DdlPreparedPack.getStringBiggerPack(gunCalibrationRecord.getStartTime(), "startTime", packBean);
}
if (!StringUtils.isEmpty(gunCalibrationRecord.getStartTime())) {
DdlPreparedPack.getStringSmallerPack(gunCalibrationRecord.getEndTime(), "endTime", packBean);
}
return packBean;
}
}

61
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
Unescape Escape View File

@ -480,4 +480,65 @@ public class MesPcnHqlPack {
}
return packBean;
}
public static DdlPackBean getProdBindRecord(MesProdBindRecord prodBindRecord) {
DdlPackBean packBean = getAllBaseData(prodBindRecord.getOrganizeCode());
if (!StringUtils.isEmpty(prodBindRecord.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(prodBindRecord.getSerialNumber(), "serialNumber", packBean);
}
return packBean;
}
public static DdlPackBean getProductData(MesProductData productData) {
DdlPackBean packBean = getAllBaseData(productData.getOrganizeCode());
if (!StringUtils.isEmpty(productData.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(productData.getSerialNumber(), "serialNumber", packBean);
}
return packBean;
}
/**
* MES工作中心信息查询条件封装
*
* @param mesWorkCenter
* @return
*/
public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode);
if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
}
if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterName())) {
DdlPreparedPack.getStringLikerPack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean);
}
if (!StringUtils.isEmpty(mesWorkCenter.getAreaCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
}
return packBean;
}
/**
* MES工作单元信息查询条件封装
*
* @param mesWorkCell
* @return
*/
public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode);
if (!StringUtils.isEmpty(mesWorkCell.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean);
}
if (!StringUtils.isEmpty(mesWorkCell.getAreaCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean);
}
if (!StringUtils.isEmpty(mesWorkCell.getWorkCellCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean);
}
if (!StringUtils.isEmpty(mesWorkCell.getWorkCellName())) {
DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCellName(), "workCellName", packBean);
}
return packBean;
}
}

60
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java
Unescape Escape View File

@ -4,7 +4,6 @@ import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Column;
import java.io.Serializable;
/**
@ -63,7 +62,7 @@ public class TorqueCollectionModel implements Serializable {
private Integer pest8;
@ApiParam("扭矩枪编号")
private String torqueNo;
private Integer torqueNo;
@ApiParam("PEST号")
private Integer pestNum;
@ -101,10 +100,60 @@ public class TorqueCollectionModel implements Serializable {
@ApiParam("组合码")
private String groupCode;
/**
* 大枪查询结果构造方法
* @param vinCode
* @param prodCfgTypeCode
* @param gradeCode
* @param colorCode
* @param partNo
* @param partName
* @param torqueNo
* @param checkScanCount
* @param sendSeq
* @param yellowGunRule
* @param isEndSeq
* @param groupCode
*/
public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo,
String partName, Integer torqueNo, Integer checkScanCount, Integer sendSeq,
Integer yellowGunRule, Integer isEndSeq, String groupCode) {
this.vinCode = vinCode;
this.prodCfgTypeCode = prodCfgTypeCode;
this.gradeCode = gradeCode;
this.colorCode = colorCode;
this.partNo = partNo;
this.partName = partName;
this.torqueNo = torqueNo;
this.checkScanCount = checkScanCount;
this.sendSeq = sendSeq;
this.yellowGunRule = yellowGunRule;
this.isEndSeq = isEndSeq;
this.groupCode = groupCode;
}
/**
* 小枪结果数据构造方法
* @param vinCode
* @param prodCfgTypeCode
* @param gradeCode
* @param colorCode
* @param partNo
* @param partName
* @param pest1
* @param pest2
* @param pest3
* @param pest4
* @param pest5
* @param pest6
* @param pest7
* @param pest8
* @param torqueNo
*/
public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode,
String colorCode, String partNo, String partName, Integer pest1, Integer pest2,
Integer pest3, Integer pest4, Integer pest5, Integer pest6, Integer pest7, Integer pest8,
String torqueNo, Integer checkScanCount, Integer sendSeq, Integer yellowGunRule, Integer isEndSeq, String groupCode) {
Integer torqueNo) {
this.vinCode = vinCode;
this.prodCfgTypeCode = prodCfgTypeCode;
this.gradeCode = gradeCode;
@ -120,10 +169,5 @@ public class TorqueCollectionModel implements Serializable {
this.pest7 = pest7;
this.pest8 = pest8;
this.torqueNo = torqueNo;
this.checkScanCount = checkScanCount;
this.sendSeq = sendSeq;
this.yellowGunRule = yellowGunRule;
this.isEndSeq = isEndSeq;
this.groupCode = groupCode;
}
}

9
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java
Unescape Escape View File

@ -53,6 +53,15 @@ public class SysLogSystem extends BaseBean {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@Indexed
@Column(name="LOG_MODULE_ID")
@ApiParam(value ="系统模块（枚举）", example = "1")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
private Integer logModuleId;
public String getLogModuleId() {
return logModuleId == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(logModuleId);
}
@Column(name="REMOTE_IP")
@ApiParam(value ="请求IP" , access ="请求IP")
private String remoteIp;

154
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java
Unescape Escape View File

@ -0,0 +1,154 @@
package cn.estsh.i3plus.pojo.sweb.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Version;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-05-27
* @Modify:
**/
@Data
@Table(name = "SWEB_DOC_MOVEMENT_DETAILS")
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("移库单-明细")
public class SwebDocMovementDetails extends BaseBean {
private static final long serialVersionUID = -1232334350341792942L;
@Column(name = "DEST_AREA_NO")
@ApiParam("目的库存地代码")
public String destAreaNo;
@Column(name = "DEST_WH_NO")
@ApiParam("目标仓库代码")
public String destWhNo;
@Column(name = "DEST_ZONE_NO")
@ApiParam("目标存储区代码")
public String destZoneNo;
@Column(name = "DEST_LOCATE_NO")
@ApiParam("目标库位代码")
public String destLocateNo;
@Column(name = "ORDER_NO")
@ApiParam(value = "移库单单号")
private String orderNo;
@Column(name = "PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name = "ITEM")
@ApiParam("行号")
public String item;
/**
* 是否免费:0=计费,1=免费
*/
@Column(name = "IS_FREE")
@ApiParam(value = "是否免费", example = "1")
public Integer isFree;
/**
* 状态:N=正常,C=行取消
*/
@Column(name = "ITEM_STATUS")
@ApiParam(value = "状态", example = "1")
private Integer itemStatus;
@Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已拣货数量", example = "1")
private Double pickQty;
@Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已出库数量", example = "1")
private Double outQty;
@Column(name = "REC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已收货数量", example = "1")
private Double recQty;
@Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已移库数量", example = "1")
private Double moveQty;
@Column(name = "PLAN_DATE")
@ApiParam(value = "计划日期")
private String planDate;
@Column(name = "PLAN_TIME")
@ApiParam(value = "计划时间")
private String planTime;
@Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "条码打印数量", example = "1")
private Double printQty;
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@Column(name = "REMARK")
@ApiParam(value = "操作原因")
private String remark;
@Column(name = "SRC_AREA_NO")
@ApiParam("源库存地代码")
public String srcAreaNo;
@Column(name = "SRC_WH_NO")
@ApiParam("源仓库代码")
public String srcWhNo;
@Column(name = "SRC_ZONE_NO")
@ApiParam("源存储区代码")
public String srcZoneNo;
@Column(name = "SRC_LOCATE_NO")
@ApiParam("源库位代码")
public String srcLocateNo;
@Column(name = "UNIT")
@ApiParam("单位")
public String unit;
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public transient Integer lockVersion;
@Column(name = "IS_SN")
@ApiParam(value = "条码生成状态", example = "20")
public Integer isSn;
@Column(name = "LOT_NO")
@ApiParam("批次")
public String lotNo;
}

141
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java
Unescape Escape View File

@ -0,0 +1,141 @@
package cn.estsh.i3plus.pojo.sweb.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-05-27
* @Modify:
**/
@Data
@Table(name = "SWEB_DOC_MOVEMENT_MASTER")
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("移库单-主表")
public class SwebDocMovementMaster extends BaseBean {
private static final long serialVersionUID = -4539662053206835169L;
@Column(name = "ORDER_NO")
@ApiParam(value = "移库单单号")
private String orderNo;
@Column(name = "BUSI_TYPE")
@ApiParam("业务类型")
public String busiType;
@Column(name = "CAR_NO")
@ApiParam(value = "车牌号")
private String carNo;
@Column(name = "CUST_NO")
@ApiParam(value = "客户编号")
private String custNo;
@Column(name = "CUST_ORDER_NO")
@ApiParam(value = "客户单号")
private String custOrderNo;
@Column(name = "ERP_SRC_NO")
@ApiParam(value = "ERP单号")
private String erpSrcNo;
@Column(name = "IS_TASK")
@ApiParam(value = "是否生产任务", example = "1")
public Integer isTask;
@Column(name = "IS_PART")
@ApiParam(value = "是否散件", example = "1")
private Integer isPart;
/**
* 移动类型:IN=入库,OUT=出库,MOVE=移库
*/
@Column(name = "MOVE_TYPE")
@ApiParam("移动类型")
public Integer moveType;
/**
* 状态:0=新建,10=处理中
* ,20=已完成,90=已关闭,91=已取消
*/
@Column(name = "ORDER_STATUS")
@ApiParam(value = "状态", example = "1")
public Integer orderStatus;
@Column(name = "PRIORITY")
@ApiParam(value = "优先级", example = "1")
public Integer priority;
/**
* 关联单据类型:1=ASN,10=PO,20=SO
*/
@Column(name = "REF_TYPE")
@ApiParam(value = "关联单据类型")
private String refType;
@Column(name = "REF_NO")
@ApiParam(value = "关联单据")
private String refNo;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编号")
private String vendorNo;
@Column(name = "VERSION")
@ApiParam(value = "版本", example = "1")
private Integer version;
@Column(name = "TAG")
@ApiParam(value = "标签")
private String tag;
@Column(name = "FLAG_NO")
@ApiParam(value = "客户发往地编号")
private String flagNo;
@Column(name = "PRINT_STATUS")
@ApiParam("打印状态")
private Integer printStatus;
@Column(name = "PRINT_STATUS")
@ApiParam("打印状态")
private Integer isSn;
@Column(name = "DEST_WH_NO")
@ApiParam("目的仓库代码")
private String destWhNo;
@Column(name = "DEST_ZONE_NO")
@ApiParam("目的存储区代码")
private String destZoneNo;
@Column(name = "PLAN_DATE")
@ApiParam("计划日期")
private String planDate;
@Column(name = "PLAN_TIME")
@ApiParam("计划时间")
private String planTime;
@Column(name = "SRC_WH_NO")
@ApiParam("源仓库代码")
private String srcWhNo;
@Column(name = "SRC_ZONE_NO")
@ApiParam("源存储区代码")
private String srcZoneNo;
}

77
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java
Unescape Escape View File

@ -0,0 +1,77 @@
package cn.estsh.i3plus.pojo.sweb.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-05-27
* @Modify:
**/
@Data
@Table(name = "SWEB_DOC_MOVEMENT_SN")
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("移库单-条码")
public class SwebDocMovementSn extends BaseBean {
private static final long serialVersionUID = -8545031740048178867L;
@Column(name="ORDER_NO")
@ApiParam("订单号")
public String orderNo;
@Column(name="ITEM")
@ApiParam("行号")
public String item;
@Column(name="PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;
@Column(name="UNIT")
@ApiParam("单位")
public String unit;
/**
* 状态：操作状态 itemStatus
*/
@Column(name="SN_STATUS")
@ApiParam(value = "操作状态", example = "10")
public Integer snStatus;
@Column(name="SN")
@ApiParam("条码")
public String sn;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编码")
public String vendorNo;
@Column(name = "SN_TYPE")
@ApiParam(value = "条码类型")
private Integer snType;
}

20
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebMovementModel.java
Unescape Escape View File

@ -0,0 +1,20 @@
package cn.estsh.i3plus.pojo.sweb.modelbean;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@Data
public class SwebMovementModel {
@ApiParam(value = "工厂代码")
private String organizeCode;
@ApiParam(value = "物料号")
private String partNo;
@ApiParam(value = "物料名称")
private String partName;
@ApiParam(value = "需求数量")
private Double qty;
}

9
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebDocMovementDetailsRepository.java
Unescape Escape View File

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.sweb.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.sweb.bean.SwebDocMovementDetails;
import org.springframework.stereotype.Repository;
@Repository
public interface SwebDocMovementDetailsRepository extends BaseRepository<SwebDocMovementDetails, Long> {
}

9
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebDocMovementMasterRepository.java
Unescape Escape View File

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.sweb.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.sweb.bean.SwebDocMovementMaster;
import org.springframework.stereotype.Repository;
@Repository
public interface SwebDocMovementMasterRepository extends BaseRepository<SwebDocMovementMaster, Long> {
}

9
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebDocMovementSnRepository.java
Unescape Escape View File

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.sweb.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.sweb.bean.SwebDocMovementSn;
import org.springframework.stereotype.Repository;
@Repository
public interface SwebDocMovementSnRepository extends BaseRepository<SwebDocMovementSn, Long> {
}

14
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
Unescape Escape View File

@ -171,4 +171,18 @@ public class SwebHqlPack {
DdlPreparedPack.getNumNOEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result);
return buildHql(details, result);
}
public static DdlPackBean getDocMovementMaster(SwebDocMovementMaster master) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
return buildHql(master, result);
}
public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
return buildHql(details, result);
}
}

12
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java
Unescape Escape View File

@ -76,6 +76,10 @@ public class QmsStockSnExtBh extends BaseBean {
public Integer pickStatus;
@Transient
@ApiParam("挑选状态")
public Integer pickResult;
@Transient
@ApiParam("物料号")
public String partNo;
@ -87,9 +91,7 @@ public class QmsStockSnExtBh extends BaseBean {
@ApiParam("客户发往地")
public String flagNo;
@Transient
@ApiParam("挑选状态")
public Integer pickResult;
@Transient
@ApiParam("二维码")
@ -114,6 +116,10 @@ public class QmsStockSnExtBh extends BaseBean {
this.bhType = bhType;
}
public QmsStockSnExtBh(String batchNo, Integer bhType) {
this.batchNo = batchNo;
this.bhType = bhType;
}
public QmsStockSnExtBh() {
}

37
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
Unescape Escape View File

@ -1,7 +1,9 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -210,6 +212,41 @@ public class WmsDocMovementMaster extends BaseBean {
@ApiParam("物料编号组")
public String[] partNos;
@ApiParam("是否正常运输")
@Column(name = "IS_NORMAL_TRANSPORTATION")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
private Integer isNormalTransportation;
@Column(name = "TRANSPORT_TYPE")
@ApiParam(value = "运输方式")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class)
private Integer transportType;
@Column(name = "LOGISTICS_VENDOR_NO")
@ApiParam("物流供应商")
private String logisticsVendorNo;
//正常运输 和非正常运输
@Column(name = "BUSINESS_TYPE")
@ApiParam(value = "业务类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
@AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
private Integer businessType;
@Column(name = "IS_TRANSPORTATION_CREATION")
@ApiParam(value = "运输信息创建")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
private Integer isTransportationCreation;
@Column(name = "IS_GOOD_PRODUCT")
@ApiParam(value = "运输信息创建")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
private Integer isGoodProduct;
public int getOrderStatusVal() {
return this.orderStatus == null ? 0 : this.orderStatus;
}

89
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java
Unescape Escape View File

@ -0,0 +1,89 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description : 物流费用记录
* @Reference :
* @Author :QianHuaSheng
* @CreateDate : 2020-05-15 3:18 下午
* @Modify:
**/
@Data
@Entity
@Table(name = "WMS_LOGISTIC_EXPENSE_RECORDS")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value = "物流费用记录")
public class WmsLogisticExpenseRecords extends BaseBean {
private static final long serialVersionUID = 6512855224667052310L;
@Column(name = "ORGANIZE_NAME")
@ApiParam(value = "工厂名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String organizeName;
@Column(name = "ORDER_NO")
@ApiParam("单据号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String orderNo;
@Column(name = "SHIPPING_FLAG")
@ApiParam(value = "发往地")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String shippingFlag;
@Column(name = "BUSI_TYPE")
@ApiParam("业务类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
public Integer busiType;
@Column(name = "TRANSPORT_TYPE")
@ApiParam(value = "运输方式")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT)
@AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
private Integer transportType;
@Column(name = "sum")
@ApiParam(value = "总运输费用")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private Double sum;
@Column(name = "LOGISTICS_VENDOR_NO")
@ApiParam(value = "物流供应商")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String logisticsVendorNo;
@Transient
@ApiParam(value = "状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class)
public Integer orderStatus;
public WmsLogisticExpenseRecords(WmsDocMovementMaster docMovementMaster) {
// this.organizeName = docMovementMaster.getorganizeName;
this.orderNo = docMovementMaster.getOrderNo();
this.shippingFlag = docMovementMaster.getFlagNo();
this.busiType = docMovementMaster.getBusiType();
this.transportType = docMovementMaster.getTransportType();
this.logisticsVendorNo = docMovementMaster.getLogisticsVendorNo();
}
public WmsLogisticExpenseRecords() {
}
}

81
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecordsDetails.java
Unescape Escape View File

@ -0,0 +1,81 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 物流费用记录明细
* @Reference :
* @Author :QianHuaSheng
* @CreateDate : 2020-05-15 3:18 下午
* @Modify:
**/
@Data
@Entity
@Table(name = "WMS_LOGISTIC_EXPENSE_RECORDS_DETAILS")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value = "物流费用记录明细")
public class WmsLogisticExpenseRecordsDetails extends BaseBean {
private static final long serialVersionUID = -6839107270239441520L;
@Column(name = "ORGANIZE_NAME")
@ApiParam(value = "工厂名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String organizeName;
@Column(name = "ORDER_NO")
@ApiParam("单据号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String orderNo;
@Column(name = "PART_NO")
@ApiParam("物料号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partName;
@Column(name = "unit")
@ApiParam(value = "计量单位")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
private String unit;
@Column(name = "QTY")
@ApiParam(value = "数量")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private Double qty;
@Column(name = "COST")
@ApiParam(value = "总运输费用")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private Double cost;
@Column(name = "START_TIME")
@ApiParam(value = "开始时间")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String startTime;
@Column(name = "END_TIME")
@ApiParam(value = "结束时间")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String endTime;
}

7
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java
Unescape Escape View File

@ -29,7 +29,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value = "物流费用管理", description = "物流费用管理")
@Api(value = "物流费用管理")
public class WmsLogisticsCosts extends BaseBean {
private static final long serialVersionUID = -5307311210847854654L;
@ -59,9 +59,9 @@ public class WmsLogisticsCosts extends BaseBean {
private String salesUnit;
@Column(name = "TRANSPORT_TYPE")
@ApiParam(value = "运输方式")
@ApiParam(value = "运输类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT)
@AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
private Integer transportType;
@Column(name = "price")
@ -78,4 +78,5 @@ public class WmsLogisticsCosts extends BaseBean {
@ApiParam(value = "结束日期")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String endDate;
}

125
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java
Unescape Escape View File

@ -0,0 +1,125 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 物流运费审批
* @Reference :
* @Author :QianHuaSheng
* @CreateDate : 2020-05-14 11:41 上午
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_LOGISTICS_FREIGHT_APPROVAL")
@Api("物流运费审批")
public class WmsLogisticsFreightApproval extends BaseBean {
private static final long serialVersionUID = -1385266737512278984L;
@Column(name = "ORDER_NO")
@ApiParam("单据号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String orderNo;
@Column(name = "BUSI_TYPE")
@ApiParam("单据类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "OUT_MOVEMENT_BUSI_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class)
private Integer busiType;
@Column(name = "APPROVAL_STATUS")
@ApiParam("审批状态")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "APPROVAL_STATUS")
@AnnoOutputColumn(refClass = WmsEnumUtil.APPROVAL_STATUS.class)
private Integer approvalStatus;
@Column(name = "SUPPLY_WAREHOUSE")
@ApiParam("供货仓库")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String supplyWarehouse;
@Column(name = "DEMAND_WAREHOUSE")
@ApiParam("需求仓库")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String demandWarehouse;
@Column(name = "CUST_NO")
@ApiParam("客户代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String custNo;
@Column(name = "LOGISTICS_VENDOR_NO")
@ApiParam("物流供应商")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String logisticsVendorNo;
@Column(name = "TRANSPORT_TYPE")
@ApiParam(value = "运输方式")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class)
private Integer transportType;
@Column(name = "PLACE_OF_ORIGIN_CODE")
@ApiParam(value = "客户发出地代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String placeOfOriginCode;
@Column(name = "PLACE_OF_ORIGIN_DESC")
@ApiParam(value = "客户发出地描述")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String placeOfOriginDesc;
@Column(name = "CUST_DELIVERY_CODE")
@ApiParam(value = "客户发往地代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String custDeliveryCode;
@Column(name = "CUST_DELIVERY_DESC")
@ApiParam(value = "客户发往地描述")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String custDeliveryDesc;
@Column(name = "is_urgent")
@ApiParam(value = "是否紧急")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private Integer isUrgent;
public WmsLogisticsFreightApproval(WmsDocMovementMaster docMovementMaster) {
this.orderNo = docMovementMaster.getOrderNo();
this.busiType = docMovementMaster.getBusiType();
this.organizeCode = docMovementMaster.getOrganizeCode();
this.approvalStatus = WmsEnumUtil.APPROVAL_STATUS.APPROVE_PROCESSING.getValue();
this.supplyWarehouse = docMovementMaster.getAssignSrcWhNo();
this.demandWarehouse = docMovementMaster.getAssignDestWhNo();
this.custNo = docMovementMaster.getCustNo();
this.logisticsVendorNo = docMovementMaster.getLogisticsVendorNo();
this.transportType = docMovementMaster.getTransportType();
this.placeOfOriginCode = docMovementMaster.getFlagNo();
// this.placeOfOriginDesc = placeOfOriginDesc;
this.custDeliveryCode = docMovementMaster.getAssignSrcWhNo();
// this.custDeliveryDesc = custDeliveryDesc;
this.isUrgent = WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
}
public WmsLogisticsFreightApproval() {
}
}

8
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java
Unescape Escape View File

@ -29,7 +29,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value = "物流费用管理", description = "物流费用管理")
@Api(value = "物流费用管理")
public class WmsShortLogisticsCosts extends BaseBean {
private static final long serialVersionUID = 733863151632950809L;
@ -64,9 +64,9 @@ public class WmsShortLogisticsCosts extends BaseBean {
private String logisticsVendorNo;
@Column(name = "TRANSPORT_TYPE")
@ApiParam(value = "运输方式")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT)
@AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
@ApiParam(value = "运输类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
@AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
private Integer transportType;
@Column(name = "SALES_UNIT")

45
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
Unescape Escape View File

@ -428,6 +428,35 @@ public class WmsStockSn extends BaseBean {
@ApiParam("BH类型")
private Integer bhType;
@Transient
@ApiParam("处理状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.BH_WORK_STATUS.class, refForeignKey = "value", value = "description")
private Integer workStatus;
@Transient
@ApiParam("是否合格")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
public Integer isQualified;
@Transient
@ApiParam("返修状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description")
public Integer reworkStatus;
@Transient
@ApiParam("返修结果")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
public Integer reworkResult;
@Transient
@ApiParam("挑选状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description")
public Integer pickStatus;
@Transient
@ApiParam("挑选状态")
public Integer pickResult;
public WmsStockSn() {
}
@ -647,6 +676,22 @@ public class WmsStockSn extends BaseBean {
}
public WmsStockSn(String organizeCode, String batchNo, Integer bhType, String locateNo, String partNo,
String partNameRdd, String workCenterCode, String createUser, String createDatetime,
String modifyUser, String modifyDatetime) {
this.organizeCode = organizeCode;
this.batchNo = batchNo;
this.bhType = bhType;
this.locateNo = locateNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.workCenterCode = workCenterCode;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
}
}

16
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticExpenseRecordsDetailsRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsLogisticExpenseRecordsDetails;
import org.springframework.stereotype.Repository;
/**
* @Description : 物流运费记录明细
* @Reference :
* @Author : qianhuasheng
* @CreateDate : 2019-06-28 15:17
* @Modify:
**/
@Repository
public interface WmsLogisticExpenseRecordsDetailsRepository extends BaseRepository<WmsLogisticExpenseRecordsDetails, Long> {
}

16
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticExpenseRecordsRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsLogisticExpenseRecords;
import org.springframework.stereotype.Repository;
/**
* @Description : 物流运费记录
* @Reference :
* @Author : qianhuasheng
* @CreateDate : 2019-06-28 15:17
* @Modify:
**/
@Repository
public interface WmsLogisticExpenseRecordsRepository extends BaseRepository<WmsLogisticExpenseRecords, Long> {
}

16
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsFreightApprovalRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsLogisticsFreightApproval;
import org.springframework.stereotype.Repository;
/**
* @Description : 物流运费审批
* @Reference :
* @Author : qianhuasheng
* @CreateDate : 2020-05-14 15:17
* @Modify:
**/
@Repository
public interface WmsLogisticsFreightApprovalRepository extends BaseRepository<WmsLogisticsFreightApproval, Long> {
}

33
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -3321,6 +3321,39 @@ public class WmsHqlPack {
return result;
}
/**
* 物流运费记录明细查询条件
*
* @param logisticExpenseRecordsDetails 物流运费记录明细
* @return
*/
public static DdlPackBean packHqlLogisticExpenseRecordsDetails(WmsLogisticExpenseRecordsDetails logisticExpenseRecordsDetails) {
DdlPackBean result = WmsHqlPack.packHqlWms(logisticExpenseRecordsDetails.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(logisticExpenseRecordsDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(logisticExpenseRecordsDetails.getPartName(), "partName", result);
DdlPreparedPack.getStringEqualPack(logisticExpenseRecordsDetails.getOrderNo(), "orderNo", result);
getStringBuilderPack(logisticExpenseRecordsDetails, result);
return result;
}
/**
* 物流运费记录查询条件
*
* @param logisticExpenseRecords 物流运费记录
* @return
*/
public static DdlPackBean packHqlLogisticExpenseRecords(WmsLogisticExpenseRecords logisticExpenseRecords) {
DdlPackBean result = WmsHqlPack.packHqlWms(logisticExpenseRecords.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(logisticExpenseRecords.getLogisticsVendorNo(), "logisticsVendorNo", result);
DdlPreparedPack.getNumEqualPack(logisticExpenseRecords.getTransportType(), "transportType", result);
DdlPreparedPack.getNumEqualPack(logisticExpenseRecords.getBusiType(), "busiType", result);
DdlPreparedPack.getStringEqualPack(logisticExpenseRecords.getShippingFlag(), "shippingFlag", result);
DdlPreparedPack.getStringEqualPack(logisticExpenseRecords.getOrderNo(), "orderNo", result);
getStringBuilderPack(logisticExpenseRecords, result);
return result;
}
/**
* 产品条码事务查询条件

Write Preview
Loading…
Cancel
Save