diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
index eb0862b..b3661b7 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
@@ -1226,22 +1226,22 @@ public class BlockFormEnumUtil {
/**
* 表单功能明细 触发信息
*
- * onclick script 元素上发生鼠标点击时触发。
- * ondblclick script 元素上发生鼠标双击时触发。
- * ondrag script 元素被拖动时运行的脚本。
- * ondragend script 在拖动操作末端运行的脚本。
- * ondragenter script 当元素元素已被拖动到有效拖放区域时运行的脚本。
- * ondragleave script 当元素离开有效拖放目标时运行的脚本。
- * ondragover script 当元素在有效拖放目标上正在被拖动时运行的脚本。
- * ondragstart script 在拖动操作开端运行的脚本。
- * ondrop script 当被拖元素正在被拖放时运行的脚本。
- * onmousedown script 当元素上按下鼠标按钮时触发。
- * onmousemove script 当鼠标指针移动到元素上时触发。
- * onmouseout script 当鼠标指针移出元素时触发。
- * onmouseover script 当鼠标指针移动到元素上时触发。
- * onmouseup script 当在元素上释放鼠标按钮时触发。
- * onmousewheel script 当鼠标滚轮正在被滚动时运行的脚本。
- * onscroll script 当元素滚动条被滚动时运行的脚本。
+ * onclick script 元素上发生鼠标点击时触发。
+ * ondblclick script 元素上发生鼠标双击时触发。
+ * ondrag script 元素被拖动时运行的脚本。
+ * ondragend script 在拖动操作末端运行的脚本。
+ * ondragenter script 当元素元素已被拖动到有效拖放区域时运行的脚本。
+ * ondragleave script 当元素离开有效拖放目标时运行的脚本。
+ * ondragover script 当元素在有效拖放目标上正在被拖动时运行的脚本。
+ * ondragstart script 在拖动操作开端运行的脚本。
+ * ondrop script 当被拖元素正在被拖放时运行的脚本。
+ * onmousedown script 当元素上按下鼠标按钮时触发。
+ * onmousemove script 当鼠标指针移动到元素上时触发。
+ * onmouseout script 当鼠标指针移出元素时触发。
+ * onmouseover script 当鼠标指针移动到元素上时触发。
+ * onmouseup script 当在元素上释放鼠标按钮时触发。
+ * onmousewheel script 当鼠标滚轮正在被滚动时运行的脚本。
+ * onscroll script 当元素滚动条被滚动时运行的脚本。
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -1429,4 +1429,54 @@ public class BlockFormEnumUtil {
return tmp;
}
}
+
+ /**
+ * 菜单类型
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum MENU_TYPE {
+ FORM_METHOD(1, "FORM_METHOD", "表单功能"),
+ OUTER_CHAIN(2, "OUTER_CHAIN", "外链");
+
+ private int value;
+ private String name;
+ private String description;
+
+ MENU_TYPE(int value, String name, String description) {
+ this.value = value;
+ this.name = name;
+ this.description = description;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public static MENU_TYPE valueOf(int val) {
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == val) {
+ return values()[i];
+ }
+ }
+ return null;
+ }
+
+ public static int descOf(String desc) {
+ int tmp = 1;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].name.equals(desc)) {
+ tmp = values()[i].value;
+ }
+ }
+ return tmp;
+ }
+ }
}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 2d479ab..e913099 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -180,57 +180,6 @@ public class WmsEnumUtil {
}
/**
- * 主表信息 单据来源
- */
- @JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum ORDER_SRC {
- MNU(10, "MNU", "手工"),
- ERP(20, "ERP", "ERP接口");
-
- private int value;
- private String code;
- private String description;
-
- ORDER_SRC(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;
- }
- }
-
- /**
* 主表信息 单据类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -425,69 +374,6 @@ public class WmsEnumUtil {
}
}
- /**
- * 消息队列，队列名称
- * 1: success_queue
- * 2: fail_queue
- */
- @JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum QUEUE_NAME {
-
- SUCCESS_QUEUE(1, "wms_success_queue", "成功消息队列"),
- PENDING_QUEUE(2, "wms_pending_queue", "待处理消息队列");
-
- private int value;
- private String name;
- private String description;
-
- QUEUE_NAME(int value, String name, String description) {
- this.value = value;
- this.name = name;
- this.description = description;
- }
-
- public int getValue() {
- return value;
- }
-
- public String getName() {
- return name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public static String valueOfCode(int val) {
- String tmp = null;
- for (int i = 0; i < values().length; i++) {
- if (values()[i].value == val) {
- tmp = values()[i].name;
- }
- }
- return tmp;
- }
-
- 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;
- }
-
- public static String codeOfDescription(String code) {
- String tmp = null;
- for (int i = 0; i < values().length; i++) {
- if (values()[i].name.equals(code)) {
- tmp = values()[i].description;
- }
- }
- return tmp;
- }
- }
/**
* 产品入库的产品状态
@@ -1293,41 +1179,6 @@ public class WmsEnumUtil {
}
}
- /**
- * 库存移动单明细状态
- */
- @JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum MOVE_DETAIL_STATUS {
- CREATE(10, "创建"),
- BE_HANDLE(20, "待处理"),
- FINISH(30, "已处理");
-
- private int value;
- private String description;
-
- MOVE_DETAIL_STATUS(int value, String description) {
- this.value = value;
- this.description = description;
- }
-
- public int getValue() {
- return value;
- }
-
- public String getDescription() {
- return description;
- }
-
- 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;
- }
- }
/**
* 质检业务类型
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java
index 2d6f0b0..81e5d14 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java
@@ -62,7 +62,7 @@ public class BfMenu extends BaseBean {
@Column(name="METHOD_ID")
@ApiParam(value ="功能id")
- private String methodId;
+ private Long methodId;
@Column(name = "MENU_STATUS")
@ApiParam(value = "菜单状态")
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java
index d7344ba..b590a94 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java
@@ -32,10 +32,6 @@ public class BfMethodDetail extends BaseBean {
@ApiParam(value ="功能id")
private Long methodId;
- @Column(name="METHOD_NAME_RDD")
- @ApiParam(value ="功能名称")
- private String methodNameRdd;
-
@Column(name="layout_column_id")
@ApiParam(value ="布局列id")
private Long layoutColumnId;
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
index 95afcb3..21c8c2a 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.form.sqlpack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.form.bean.BfLayout;
import cn.estsh.i3plus.pojo.form.bean.BfLayoutRow;
+import cn.estsh.i3plus.pojo.form.bean.BfMenu;
+import cn.estsh.i3plus.pojo.form.bean.BfMethod;
import org.apache.commons.lang3.StringUtils;
/**
@@ -89,4 +91,34 @@ public final class FormHqlPack {
result.append(bfLayoutRow.orderBy());
return result.toString();
}
+
+ /**
+ * 菜单目录复杂查询
+ * @param bfMenu 菜单目录
+ * @return hql
+ */
+ public static String packHqlBfMenu(BfMenu bfMenu) {
+ StringBuffer result = new StringBuffer();
+
+ HqlPack.getStringLikerPack(bfMenu.getMenuName(), "menuName", result);
+ HqlPack.getNumEqualPack(bfMenu.getParentId(), "parentId", result);
+ HqlPack.getNumEqualPack(bfMenu.getIsDeleted(), "isDeleted", result);
+
+ return result.toString();
+ }
+
+ /**
+ * 表单功能复杂查询
+ * @param bfMethod 表单功能查询条件
+ * @return hql
+ */
+ public static String packHqlBfMethod(BfMethod bfMethod) {
+ StringBuffer result = new StringBuffer();
+
+ HqlPack.getStringLikerPack(bfMethod.getMethodName(), "methodName", result);
+ HqlPack.getNumEqualPack(bfMethod.getLayoutId(), "layoutId", result);
+ HqlPack.getNumEqualPack(bfMethod.getIsDeleted(), "isDeleted", result);
+
+ return result.toString();
+ }
}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java
index 7389c5e..329b391 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java
@@ -1,5 +1,8 @@
package cn.estsh.i3plus.pojo.model.wms;
+import cn.estsh.i3plus.pojo.wms.bean.WmsASNMaster;
+import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementMaster;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@@ -13,33 +16,28 @@ import lombok.Data;
@Data
public class PrintOrderDataModel {
- @ApiParam(value = "工厂代码")
- public String organizeCode;
+ @ApiParam("业务数据类型")
+ public Integer busiDataType;
- @ApiParam(value = "单号")
+ @ApiParam("单号")
public String orderNo;
- @ApiParam(value = "业务类型", example = "-1")
- public Integer busiType;
-
- @ApiParam(value = "状态", example = "-1")
- public Integer status;
-
- @ApiParam(value = "打印标志", example = "-1")
- public Integer printFlag;
-
- @ApiParam(value = "供应商编号")
- public String vendorNo;
+ @ApiParam("工厂代码")
+ public String organizeCode;
- @ApiParam(value = "客户编号")
- public String custNo;
+ @ApiParam(value = "PO主表")
+ public WmsPOMaster poMaster;
- @ApiParam(value = "版本")
- public String version;
+ @ApiParam(value = "ASN主表")
+ public WmsASNMaster asnMaster;
- @ApiParam(value = "ERP单号")
- public String erpSrcNo;
+ @ApiParam(value = "移库单主表")
+ public WmsDocMovementMaster movementMaster;
- @ApiParam(value = "业务数据类型", example = "-1")
- public Integer busiDataType;
+ public int getBusiDataType() {
+ if (busiDataType != null) {
+ return busiDataType.intValue();
+ }
+ return 0;
+ }
}
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java
index 5ac2217..beecd61 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java
@@ -75,6 +75,10 @@ public class SysTaskPlan extends BaseBean {
@ApiParam(value ="任务所属模块")
private Integer taskSoftTypeRdd;
+ @Column(name="TASK_PLAN_PARAM")
+ @ApiParam(value ="任务计划参数")
+ private String taskPlanParam;
+
@Column(name="TASK_CYCLE_START_DATE_TIME_RDD")
@ApiParam(value ="任务开始时间")
private String taskCycleStartDateTimeRdd;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
index 179c7b6..739b65d 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
@@ -66,4 +66,7 @@ public class WmsASNMaster extends BaseBean {
@ApiParam(value = "是否生产任务", example = "1")
public Integer isTask;
+ @ApiParam("ASN详情列表")
+ @Transient
+ public List asnMasterDetailsList;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
index 640d69e..ce33950 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
@@ -5,6 +5,7 @@ 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;
@@ -41,6 +42,7 @@ public class WmsASNMasterDetails extends BaseBean {
public Integer item;
@Column(name = "QTY")
+ @ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@@ -107,6 +109,7 @@ public class WmsASNMasterDetails extends BaseBean {
public String vendorLotNo;
@Column(name = "REC_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "已收数量", example = "0")
public Double recQty;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
index b99f4ec..62f285f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
@@ -49,7 +49,7 @@ public class WmsActionResponseBean {
public Obj details;
@ApiParam(value = "结果代码")
- public Boolean codeStatus;
+ public Boolean codeStatus = true;
@ApiParam(value = "作业任务编号", example = "1")
@JsonSerialize(using = ToStringSerializer.class)
@@ -77,6 +77,12 @@ public class WmsActionResponseBean {
/**
* 默认为true，如果这个值为true就禁用按钮否则可用，
*/
+ @ApiParam(value = "按钮是否禁用")
+ public Boolean isCommitBtnDisabled = true;
+
+ /**
+ * 默认为true，如果这个值为true就禁用按钮否则可用，
+ */
@ApiParam(value = "输入框是否禁用")
public Boolean isInputBtnDisabled = false;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
index 96eb0b1..5d950d3 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
@@ -5,6 +5,7 @@ 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;
@@ -57,6 +58,7 @@ public class WmsCSFactTrans extends BaseBean {
public String sn;
@Column(name="QTY")
+ @ColumnDefault("0")
@ApiParam(value = "库存数量", example = "0")
public Double qty;
@@ -65,6 +67,7 @@ public class WmsCSFactTrans extends BaseBean {
public String unit;
@Column(name="FACT_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "实盘数量", example = "0")
public Double factQty;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
index a9391f9..6e72309 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
@@ -5,6 +5,7 @@ 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;
@@ -40,6 +41,7 @@ public class WmsCSOrderDetails extends BaseBean {
public Integer item;
@Column(name = "QTY")
+ @ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@@ -91,4 +93,8 @@ public class WmsCSOrderDetails extends BaseBean {
@Column(name = "TRANS_STATUS")
@ApiParam(value = "处理状态", example = "1")
public Integer transStatus;
+
+ public Double getQty() {
+ return this.qty == null ? 0 : this.qty;
+ }
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index ff54102..caaad9d 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -5,6 +5,7 @@ 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;
@@ -40,6 +41,7 @@ public class WmsDocMovementDetails extends BaseBean {
public Integer item;
@Column(name = "QTY")
+ @ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@@ -76,6 +78,7 @@ public class WmsDocMovementDetails extends BaseBean {
public String destLocateNo;
@Column(name = "PRINT_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "条码打印数量", example = "1")
private Double printQty;
@@ -109,18 +112,22 @@ public class WmsDocMovementDetails extends BaseBean {
private String remark;
@Column(name = "PICK_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "已拣货数量", example = "1")
private Double pickQty;
@Column(name = "OUT_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "已出库数量", example = "1")
private Double outQty;
@Column(name = "REC_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "已收货数量", example = "1")
private Double recQty;
@Column(name = "MOVE_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "已移库数量", example = "1")
private Double moveQty;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
index a2ddf74..72e0030 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
@@ -108,4 +108,8 @@ public class WmsDocMovementMaster extends BaseBean {
@Transient
@ApiParam(value = "目的库存地代码")
private String desrAreaNo;
+
+ @Column(name = "IS_PART")
+ @ApiParam(value = "是否散件")
+ private Integer isPart;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
index 0a1030e..1a0230a 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
@@ -5,6 +5,7 @@ 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;
@@ -46,6 +47,7 @@ public class WmsDocMovementSn extends BaseBean {
public String partNameRdd;
@Column(name="QTY")
+ @ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java
index 9be8adb..f720f6a 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java
@@ -5,6 +5,7 @@ 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;
@@ -45,6 +46,7 @@ public class WmsFGInStock extends BaseBean {
public String partNameRdd;
@Column(name="QTY")
+ @ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
index 67cc0ee..276a37d 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
@@ -93,5 +93,22 @@ public class WmsLocate extends BaseBean {
@Column(name="PART_QTY")
@ApiParam(value ="零件数", example = "-1")
- private Integer partQty;
+ private Double partQty;
+
+ public Integer getMaxPackageQty() {
+ return this.maxPackageQty == null ? 0 : this.maxPackageQty;
+ }
+
+ public Integer getMaxPartQty() {
+ return this.maxPartQty == null ? 0 : this.maxPartQty;
+ }
+
+ public Integer getBoxQty() {
+ return this.boxQty == null ? 0 : this.boxQty;
+ }
+
+ public Double getPartQty() {
+ return this.partQty == null ? 0 : this.partQty;
+ }
+
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
index 9dc8bae..4231c17 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
@@ -74,6 +74,7 @@ public class WmsMoveSn extends BaseBean {
public String packAgeNo;
@Column(name="SRC_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "源数量", example = "0")
public Double srcQty;
@@ -110,10 +111,12 @@ public class WmsMoveSn extends BaseBean {
private Long finishedCounts;
@Column(name="DEST_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "目标数量", example = "0")
public Double destQty;
@Column(name="QTY")
+ @ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
index ad1faae..a1bc44b 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
@@ -12,6 +12,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
+import java.util.List;
/**
* @Description : PO订单主表
@@ -78,4 +79,12 @@ public class WmsPOMaster extends BaseBean {
@Column(name="IS_TASK")
@ApiParam(value = "是否生产任务", example = "1")
public Integer isTask;
+
+ @Column(name="IS_PART")
+ @ApiParam(value = "是否散件", example = "1")
+ public Integer isPart;
+
+ @ApiParam("PO明细列表信息")
+ @Transient
+ public List poDetailList;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
index f65e744..364199b 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
@@ -5,6 +5,7 @@ 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;
@@ -40,6 +41,7 @@ public class WmsPOMasterDetails extends BaseBean {
public Integer item;
@Column(name = "QTY")
+ @ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@@ -52,18 +54,22 @@ public class WmsPOMasterDetails extends BaseBean {
public String orderNo;
@Column(name = "PRINT_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "条码打印数量", example = "0")
public Double printQty;
@Column(name = "RC_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "收货数量", example = "0")
public Double rcQty;
@Column(name = "PASS_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "质检合格数量", example = "0")
public Double passQty;
@Column(name = "NG_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "质检不合格数量", example = "0")
public Double ngQty;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java
index 619f29a..9fdfdd0 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java
@@ -5,6 +5,7 @@ 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;
@@ -46,6 +47,7 @@ public class WmsPoSn extends BaseBean {
public String partNameRdd;
@Column(name="QTY")
+ @ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;
@@ -78,6 +80,7 @@ public class WmsPoSn extends BaseBean {
public String groupNo;
@Column(name="REC_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "收货数量", example = "0")
public Double recQty;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java
index 779e705..b7dd03a 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java
@@ -6,6 +6,7 @@ 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;
@@ -41,6 +42,7 @@ public class WmsQCDetails extends BaseBean {
public Integer item;
@Column(name = "QTY")
+ @ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@@ -65,14 +67,17 @@ public class WmsQCDetails extends BaseBean {
@Column(name = "FACT_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "实检数量", example = "0")
public Double factQty;
@Column(name = "PASS_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "合格数量", example = "0")
public Double passQty;
@Column(name = "REJECT_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "不合格数量", example = "0")
public Double rejectQty;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java
index 8c1eae2..d8a367b 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java
@@ -87,4 +87,8 @@ public class WmsQCMaster extends BaseBean {
@Column(name = "IS_TASK")
@ApiParam(value = "是否生产任务", example = "1")
public Integer isTask;
+
+ @Column(name="IS_PART")
+ @ApiParam(value = "是否散件", example = "2")
+ public Integer isPart;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java
index 9d9c2a2..429f415 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java
@@ -5,6 +5,7 @@ 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;
@@ -42,6 +43,7 @@ public class WmsShopping extends BaseBean {
public String partNameRdd;
@Column(name="QTY")
+ @ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java
index d2fa686..0ab7b22 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java
@@ -5,6 +5,7 @@ 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 org.springframework.format.annotation.DateTimeFormat;
@@ -60,6 +61,7 @@ public class WmsSnPrintRcd extends BaseBean {
private String unit;
@Column(name = "QTY")
+ @ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
private Double qty;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
index d34efd0..325dafc 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
@@ -5,6 +5,7 @@ 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;
@@ -57,34 +58,74 @@ public class WmsStockQuan extends BaseBean {
private String custNo;
@Column(name = "QTY")
+ @ColumnDefault("0")
@ApiParam(value = "可用数量", example = "0")
public Double qty;
@Column(name = "FAIL_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "不合格数量", example = "0")
private Double failQty;
@Column(name = "HOLD_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "隔离数量", example = "0")
private Double holdQty;
@Column(name = "QC_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "质检中数量", example = "0")
private Double qcQty;
@Column(name = "RIN_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "待入库数量", example = "0")
private Double rinQty;
@Column(name = "FREEZE_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "冻结数量", example = "0")
private Double freezeQty;
@Column(name = "CONSIGN_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "寄售数量", example = "0")
private Double consignQty;
@Column(name = "LOCK_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "锁定数量", example = "0")
private Double lockQty;
+
+ public Double getQty() {
+ return this.qty == null ? 0 : this.qty;
+ }
+
+ public Double getFailQty() {
+ return this.failQty == null ? 0 : this.failQty;
+ }
+
+ public Double getHoldQty() {
+ return this.holdQty == null ? 0 : this.holdQty;
+ }
+
+ public Double getQcQty() {
+ return this.qcQty == null ? 0 : this.qcQty;
+ }
+
+ public Double getRinQty() {
+ return this.rinQty == null ? 0 : this.rinQty;
+ }
+
+ public Double getFreezeQty() {
+ return this.freezeQty == null ? 0 : this.freezeQty;
+ }
+
+ public Double getConsignQty() {
+ return this.consignQty == null ? 0 : this.consignQty;
+ }
+
+ public Double getLockQty() {
+ return this.lockQty == null ? 0 : this.lockQty;
+ }
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index 6333860..a89463d 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -5,6 +5,7 @@ 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 org.springframework.format.annotation.DateTimeFormat;
@@ -96,6 +97,7 @@ public class WmsStockSn extends BaseBean {
private String unit;
@Column(name = "QTY")
+ @ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
private Double qty;
/**
@@ -147,4 +149,20 @@ public class WmsStockSn extends BaseBean {
@ApiParam(value = "库位名称")
@Transient
public String locateNameRdd;
+
+ @ApiParam(value = "物料类型描述")
+ @Transient
+ public String partTypeDesc;
+
+ @ApiParam(value = "客户名称")
+ @Transient
+ public String custNameRdd;
+
+ @ApiParam(value = "供应商名称")
+ @Transient
+ public String vendorNameRdd;
+
+ @ApiParam(value = "二维码内容")
+ @Transient
+ public String barCode;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
index 34ab3f6..0834489 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
@@ -5,6 +5,7 @@ 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;
@@ -57,10 +58,12 @@ public class WmsTaskDetails extends BaseBean {
private String vendorNo;
@Column(name = "QTY")
+ @ColumnDefault("0")
@ApiParam(value = "需求数量", example = "1")
private Double qty;
@Column(name = "TRANS_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "处理数量", example = "1")
private Double transQty;
@@ -117,4 +120,12 @@ public class WmsTaskDetails extends BaseBean {
@Column(name = "DEST_AREA_NO")
@ApiParam("目的库存地代码")
public String destAreaNo;
+
+ public Double getQty() {
+ return this.qty == null ? 0 : this.qty;
+ }
+
+ public Double getTransQty() {
+ return this.transQty == null ? 0 : this.transQty;
+ }
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java
index d14c492..24b41f8 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java
@@ -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;
/**
* @Description : 作业任务表信息
@@ -67,4 +68,8 @@ public class WmsTaskInfo extends BaseBean {
@ApiParam("是否一步法操作")
public Integer isOneStep;
+ @ApiParam("作业类型名称")
+ @Transient
+ public String opTypeName;
+
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java
index 421e07e..52e7883 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java
@@ -7,6 +7,7 @@ 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;
@@ -57,6 +58,7 @@ public class WmsTrans extends BaseBean{
private Integer transStatus;
@Column(name="QTY")
+ @ColumnDefault("0")
@ApiParam(value ="需求数")
private Double qty;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java
index 893a13b..7c4009d 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java
@@ -5,6 +5,7 @@ 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;
@@ -93,34 +94,42 @@ public class WmsTransQuan extends BaseBean {
private String errorMessage;
@Column(name = "QTY")
+ @ColumnDefault("0")
@ApiParam(value = "可用数量", example = "0")
public Double qty;
@Column(name = "FAIL_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "不合格数量", example = "0")
private Double failQty;
@Column(name = "HOLD_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "隔离数量", example = "0")
private Double holdQty;
@Column(name = "QC_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "质检中数量", example = "0")
private Double qcQty;
@Column(name = "RIN_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "待入库数量", example = "0")
private Double rinQty;
@Column(name = "FREEZE_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "冻结数量", example = "0")
private Double freezeQty;
@Column(name = "CONSIGN_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "寄售数量", example = "0")
private Double consignQty;
@Column(name = "LOCK_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "锁定数量", example = "0")
private Double lockQty;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java
index 6fd02b2..c74b56c 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java
@@ -7,6 +7,7 @@ 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;
@@ -57,6 +58,7 @@ public class WmsTransRcd extends BaseBean{
private Integer transStatus;
@Column(name="QTY")
+ @ColumnDefault("0")
@ApiParam(value ="需求数")
private Double qty;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java
index 4a69c08..3adc50e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java
@@ -5,6 +5,7 @@ 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;
@@ -65,10 +66,12 @@ public class WmsTransSn extends BaseBean {
public String transCode;
@Column(name="QTY")
+ @ColumnDefault("0")
@ApiParam(value = "交易数量", example = "0")
public Double qty;
@Column(name="REJECT_QTY")
+ @ColumnDefault("0")
@ApiParam(value = "不合格交易数量", example = "0")
public Double rejectQty;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index fe46746..c3d8101 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -60,12 +60,12 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
//查询参数封装
- HqlPack.getStringLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
+ HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result);
- HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
- HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
- HqlPack.getStringLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result);
- HqlPack.getStringLikerPack(wmsPOMasterDetails.getPlanDate(), "planDate", result);
+ HqlPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
+ HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
+ HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result);
+ HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanDate(), "planDate", result);
getStringBuilderPack(wmsPOMasterDetails, result);
@@ -119,7 +119,7 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
//查询参数封装
- HqlPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result);
+ HqlPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result);
HqlPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", result);
HqlPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", result);
HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustNo(), "custNo", result);
@@ -139,11 +139,11 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
//查询参数封装
- HqlPack.getStringLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result);
- HqlPack.getStringLikerPack(wmsPOMaster.getPoType(), "poType", result);
+ HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result);
+ HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result);
HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result);
- HqlPack.getStringLikerPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
- HqlPack.getStringLikerPack(wmsPOMaster.getSrc(), "src", result);
+ HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
+ HqlPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
getStringBuilderPack(wmsPOMaster, result);
@@ -531,7 +531,7 @@ public class WmsHqlPack {
public static String packHqlWmsASNMaster(WmsASNMaster wmsASNMaster) {
StringBuffer result = new StringBuffer();
- HqlPack.getStringEqualPack(wmsASNMaster.getOrderNo(), "orderNo", result);
+ HqlPack.getStringRightLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result);
HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus(), "asnStatus", result);
HqlPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result);
@@ -1378,7 +1378,7 @@ public class WmsHqlPack {
*/
public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
StringBuffer result = new StringBuffer();
- HqlPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result);
+ HqlPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
getStringBuilderPack(wmsStockSn, result);
HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
return result.toString();
@@ -1479,7 +1479,7 @@ public class WmsHqlPack {
HqlPack.getStringEqualPack(wmsDataAuth.getDataObj(), "dataObj", result);
}
if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())) {
- HqlPack.getStringLikerPack(wmsDataAuth.getDataObjValue(), "dataObjValue", result);
+ HqlPack.getStringRightLikerPack(wmsDataAuth.getDataObjValue(), "dataObjValue", result);
}
getStringBuilderPack(wmsDataAuth, result);
return result.toString();
@@ -1554,10 +1554,25 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(wmsDocMovementSn.getOrderNo(), "orderNo", result);
HqlPack.getStringLikerPack(wmsDocMovementSn.getPartNo(), "partNo", result);
- HqlPack.getStringLikerPack(wmsDocMovementSn.getPartNameRdd(), "partNameRdd", result);
getStringBuilderPack(wmsDocMovementSn, result);
return result.toString();
}
+
+ /**
+ * 移库单订单条码表 分页查询
+ *
+ * @param details
+ * @return
+ */
+ public static String packHqlWmsDocMovementDetails(WmsDocMovementDetails details) {
+ StringBuffer result = new StringBuffer();
+ HqlPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
+ HqlPack.getStringEqualPack(details.getPartNo(), "partNo", result);
+
+ getStringBuilderPack(details, result);
+
+ return result.toString();
+ }
}