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

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
曾贞一 6 years ago
parent ddd91f51b5 d2c3045575
commit 9d3b45d2e2
44 changed files with 286 additions and 212 deletions
Show Stats Download Patch File Download Diff File

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

@ -393,7 +393,67 @@ public class CommonEnumUtil {
return tmp;
}
}
/**
* 数据类型
* 1库存移动数据
* 2质检数据
* 3已配料待出库
* 4JIS发运扣减
* 5报工待汇总
* 6报工汇总待处理
* 7erp接口待同步
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum NUM_TYPE {
MOVE_DETAILS(1, "MOVE_DETAILS", "库存移动数据"),
QC_DETAILS(2, "QC_DETAILS", "质检数据"),
DOC_MOVEMENT(3, "DOC_MOVEMENT", "已配料待出库"),
DOC_SHIPPING(4, "DOC_SHIPPING", "JIS发运扣减"),
FG_DETAILS(5, "FG_DETAILS", "报工待汇总"),
FG_SUM(6, "FG_SUM", "报工汇总待处理"),
ERP_INTERFACE(7, "ERP_INTERFACE", "ERP接口待同步");
private int value;
private String code;
private String description;
private NUM_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;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum USER_INFO_STATUS {
INCUMBENT(1, "正常", "正常_NORMAL"),

18
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import org.apache.commons.lang3.StringUtils;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
@ -417,6 +418,19 @@ public class DdlPreparedPack {
packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, data);
}
}
/**
* 封装double对象成大于语句
*
* @param columnName 列名
* @param packBean
*/
public static void getNumberBiggerPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, data);
}
}
/**
* 封装double对象成大于等于语句
*
@ -440,6 +454,7 @@ public class DdlPreparedPack {
packBean.addColumnQuery(columnName, " and model." + columnName + " < :m_" + columnName, data);
}
}
/**
* 封装double对象成小于等于语句
*
@ -609,10 +624,11 @@ public class DdlPreparedPack {
/**
* 转换排序列
*
* @param columnName 列名
* @param basisType 基本类型
* @see CommonEnumUtil.BASIS_TYPE
* @return
* @see CommonEnumUtil.BASIS_TYPE
*/
public static String getOrderColConvertType(String columnName, int basisType) {
String name = " model." + columnName;

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

@ -55,6 +55,10 @@ public class MesEquipment extends BaseBean {
@ApiParam("区域代码")
private String areaCode;
@Column(name="CONNECT_TYPE")
@ApiParam("连接类型")
private Integer connectType;
@Transient
@ApiParam(value ="名称")
private String name;

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

@ -42,7 +42,7 @@ public class AmpJisRec extends BaseBean{
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;

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

@ -42,7 +42,7 @@ public class AmpStockCurrent extends BaseBean {
@ApiParam(value = "单位")
private String unit;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
private Double qty;

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

@ -46,7 +46,7 @@ public class SapDocFgSum extends BaseBean {
@ApiParam("单位")
public String partNameRdd;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;
@ -75,7 +75,7 @@ public class SapDocFgSum extends BaseBean {
@ApiParam("子计量单位")
public String itemUnit;
@Column(name="ITEM_QTY")
@Column(name="ITEM_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "子用量", example = "0")
public Double itemQty;

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

@ -45,7 +45,7 @@ public class WmsASNMasterDetails extends BaseBean {
@ApiParam("行号")
public String item;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@ -112,7 +112,7 @@ public class WmsASNMasterDetails extends BaseBean {
@ApiParam("供应商批次")
public String vendorLotNo;
@Column(name = "REC_QTY")
@Column(name = "REC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已收数量", example = "0")
public Double recQty;

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

@ -43,7 +43,7 @@ public class WmsBom extends BaseBean {
@ApiParam(value = "计量单位")
private String unit;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "数量")
private Double qty;
@ -59,7 +59,7 @@ public class WmsBom extends BaseBean {
@ApiParam(value = "子计量单位")
private String itemUnit;
@Column(name = "ITEM_QTY")
@Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "子用量")
private Double itemQty;

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

@ -40,7 +40,7 @@ public class WmsBomTotal extends BaseBean {
@ApiParam("计量单位")
private String UNIT;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam("数量")
private Double qty;
@ -56,7 +56,7 @@ public class WmsBomTotal extends BaseBean {
@ApiParam(value = "子计量单位")
private String itemUnit;
@Column(name = "ITEM_QTY")
@Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "子用量")
private Double itemQty;

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

@ -61,7 +61,7 @@ public class WmsCSFactTrans extends BaseBean {
@ApiParam("条码")
public String sn;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "库存数量", example = "0")
public Double qty;
@ -70,7 +70,7 @@ public class WmsCSFactTrans extends BaseBean {
@ApiParam("单位")
public String unit;
@Column(name="FACT_QTY")
@Column(name="FACT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "实盘数量", example = "0")
public Double factQty;

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

@ -44,7 +44,7 @@ public class WmsCSOrderDetails extends BaseBean {
@ApiParam("行号")
public String item;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;

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

@ -66,11 +66,11 @@ public class WmsCheckFactRecord extends BaseBean {
@ApiParam("备注")
public String remark;
@Column(name="PLAN_QTY")
@Column(name="PLAN_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "应收数量", example = "0")
public Double planQty;
@Column(name="CHECK_QTY")
@Column(name="CHECK_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "抽点数量", example = "0")
public Double checkQty;

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

@ -66,7 +66,7 @@ public class WmsDocFgDetail extends BaseBean {
@ApiParam("BOM切换标识")
public String bomUpdate;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;
@ -91,7 +91,7 @@ public class WmsDocFgDetail extends BaseBean {
@ApiParam("子计量单位")
public String itemUnit;
@Column(name="ITEM_QTY")
@Column(name="ITEM_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "子用量", example = "0")
public Double itemQty;

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

@ -46,7 +46,7 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam("行号")
public String item;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@ -83,7 +83,7 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam("目标库位代码")
public String destLocateNo;
@Column(name = "PRINT_QTY")
@Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "条码打印数量", example = "1")
private Double printQty;
@ -119,22 +119,22 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam(value = "操作原因")
private String remark;
@Column(name = "PICK_QTY")
@Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已拣货数量", example = "1")
private Double pickQty;
@Column(name = "OUT_QTY")
@Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已出库数量", example = "1")
private Double outQty;
@Column(name = "REC_QTY")
@Column(name = "REC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已收货数量", example = "1")
private Double recQty;
@Column(name = "MOVE_QTY")
@Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已移库数量", example = "1")
private Double moveQty;

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

@ -52,7 +52,7 @@ public class WmsDocMovementSn extends BaseBean {
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;

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

@ -46,7 +46,7 @@ public class WmsFGInStock extends BaseBean {
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;

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

@ -59,15 +59,15 @@ public class WmsLineLocatePart extends BaseBean {
return isGeneratePicklist== null ? 0: this.isGeneratePicklist.intValue();
}
@Column(name = "PULL_QTY")
@Column(name = "PULL_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "拉动数量")
private Double pullQty;
@Column(name = "Max")
@Column(name = "Max", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最大值")
private Double max;
@Column(name = "Min")
@Column(name = "Min", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最小值")
private Double min;

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

@ -77,7 +77,7 @@ public class WmsLocate extends BaseBean {
@ApiParam(value = "最大包装数量", example = "-1")
private Integer maxPackageQty;
@Column(name = "MAX_PART_QTY")
@Column(name = "MAX_PART_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最大零件数量", example = "-1")
private Double maxPartQty;
@ -93,7 +93,7 @@ public class WmsLocate extends BaseBean {
@ApiParam(value = "箱数", example = "-1")
private Integer boxQty;
@Column(name = "PART_QTY")
@Column(name = "PART_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "零件数", example = "-1")
private Double partQty;

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

@ -42,15 +42,15 @@ public class WmsLocatePart extends BaseBean {
@ApiParam(value = "物料名称")
private String partNameRdd;
@Column(name = "PULL_QTY")
@Column(name = "PULL_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "拉动数量", example = "0")
private Double pullQty;
@Column(name = "MAX")
@Column(name = "MAX", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最大值", example = "0")
private Double max;
@Column(name = "MIN")
@Column(name = "MIN", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最小值", example = "0")
private Double min;

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

@ -57,7 +57,7 @@ public class WmsMoveDetails extends BaseBean {
@ApiParam("客户编号")
public String custNo;
@Column(name="TRANS_QTY")
@Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "处理数量", example = "0")
public Double transQty;
@ -65,7 +65,7 @@ public class WmsMoveDetails extends BaseBean {
return this.transQty == null ? 0 : this.transQty.doubleValue();
}
@Column(name="REJECT_QTY")
@Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "不合格处理数量", example = "0")
public Double rejectQty;
@ -200,7 +200,8 @@ public class WmsMoveDetails extends BaseBean {
return fPartName;
}*/
public WmsMoveDetails(){}
public WmsMoveDetails() {
}
public WmsMoveDetails(String partNo, Long waitingCounts, Long finishedCounts) {
this.partNo = partNo;

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

@ -83,7 +83,7 @@ public class WmsMoveSn extends BaseBean {
@ApiParam("容器编号")
public String packAgeNo;
@Column(name = "SRC_QTY")
@Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "源数量", example = "0")
public Double srcQty;
@ -120,12 +120,12 @@ public class WmsMoveSn extends BaseBean {
@Transient
private Long finishedCounts;
@Column(name = "DEST_QTY")
@Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "目标数量", example = "0")
public Double destQty;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;

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

@ -84,11 +84,11 @@ public class WmsMoveToERP extends BaseBean {
@ApiParam("客户编号")
public String custNo;
@Column(name="TRANS_QTY")
@Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "处理数量", example = "0")
public Double transQty;
@Column(name="REJECT_QTY")
@Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "不合格处理数量", example = "0")
public Double rejectQty;
@ -142,7 +142,7 @@ public class WmsMoveToERP extends BaseBean {
@ApiParam("关联单位")
public String refUnit;
@Column(name="REF_QTY")
@Column(name="REF_QTY", columnDefinition = "decimal(18,8)")
@ApiParam("关联数量")
public Double refQty;

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

@ -50,7 +50,7 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("行号")
private Integer item;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
private Double qty;
@ -67,28 +67,28 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("订单号")
private String orderNo;
@Column(name = "PRINT_QTY")
@Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "条码打印数量", example = "0")
private Double printQty;
//private Double getPrintQty(){ return this.printQty == null ? new Double(0) : this.printQty; }
@Column(name = "RC_QTY")
@Column(name = "RC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "收货数量", example = "0")
private Double rcQty;
//private Double getRcQty(){ return this.rcQty == null ? new Double(0) : this.rcQty; }
@Column(name = "PASS_QTY")
@Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "质检合格数量", example = "0")
private Double passQty;
//private Double getPassQty(){ return this.passQty == null ? new Double(0) : this.passQty; }
@Column(name = "NG_QTY")
@Column(name = "NG_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "质检不合格数量", example = "0")
private Double ngQty;
@ -114,7 +114,7 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("状态")
private Integer itemStatus;
@Column(name = "SNP")
@Column(name = "SNP", columnDefinition = "decimal(18,8)")
@ApiParam("标准包装")
private Double snp;

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

@ -41,11 +41,11 @@ public class WmsPackSn extends BaseBean {
@ApiParam(value = "物料名称")
private String partNameAdd;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam("数量")
private Double qty;
@Column(name = "SID")
@Column(name = "SID", columnDefinition = "decimal(18,8)")
@ApiParam("SID")
private Double sId;

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

@ -74,7 +74,7 @@ public class WmsPart extends BaseBean {
@ApiParam(value = "采购单位")
private String buyUnit;
@Column(name = "BU2SU")
@Column(name = "BU2SU", columnDefinition = "decimal(18,8)")
@ApiParam(value = "换算率1", example = "1")
private Double bu2su;
@ -82,11 +82,11 @@ public class WmsPart extends BaseBean {
@ApiParam(value = "计价单位")
private String priceUnit;
@Column(name = "PU2SU")
@Column(name = "PU2SU", columnDefinition = "decimal(18,8)")
@ApiParam(value = "换算率2", example = "1")
private Double pu2su;
@Column(name = "SNP")
@Column(name = "SNP", columnDefinition = "decimal(18,8)")
@ApiParam(value = "标准包装", example = "1")
private Double snp;
@ -95,11 +95,11 @@ public class WmsPart extends BaseBean {
@ApiParam(value = "是否免检", example = "1")
private Integer iqc;
@Column(name = "MIN")
@Column(name = "MIN", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最低库存", example = "1")
private Double min;
@Column(name = "MAX")
@Column(name = "MAX", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最高库存", example = "1")
private Double max;

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

@ -51,7 +51,7 @@ public class WmsPoSn extends BaseBean {
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;
@ -84,7 +84,7 @@ public class WmsPoSn extends BaseBean {
@ApiParam("组条码")
public String groupNo;
@Column(name="REC_QTY")
@Column(name="REC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "收货数量", example = "0")
public Double recQty;

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

@ -42,7 +42,7 @@ public class WmsQCDetails extends BaseBean {
@ApiParam("行号")
public String item;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@ -67,17 +67,17 @@ public class WmsQCDetails extends BaseBean {
public String remark;
@Column(name = "FACT_QTY")
@Column(name = "FACT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "实检数量", example = "0")
public Double factQty;
@Column(name = "PASS_QTY")
@Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "合格数量", example = "0")
public Double passQty;
@Column(name = "REJECT_QTY")
@Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "不合格数量", example = "0")
public Double rejectQty;

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

@ -44,7 +44,7 @@ public class WmsShipping extends BaseBean {
@ApiParam("物料名称")
public String partNameRdd;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;

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

@ -46,7 +46,7 @@ public class WmsSnOperateRecord extends BaseBean {
@ApiParam(value = "库位代码")
private String locateNo;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "数量", example = "0")
private Double qty = 0d;

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

@ -61,7 +61,7 @@ public class WmsSnPrintRcd extends BaseBean {
@ApiParam(value = "单位")
private String unit;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
private Double qty;

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

@ -60,12 +60,12 @@ public class WmsStockInitialize extends BaseBean {
@AnnoOutputColumn
private String unit;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "可用数量", example = "0")
@AnnoOutputColumn
private Double qty = 0d;
@Column(name = "SNP")
@Column(name = "SNP", columnDefinition = "decimal(18,8)")
@ApiParam(value = "标准包装", example = "1")
@AnnoOutputColumn
private Double snp;

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

@ -79,47 +79,47 @@ public class WmsStockQuan extends BaseBean {
private WmsLocate wmsLocate;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "可用数量", example = "0")
public Double qty;
@Column(name = "FAIL_QTY")
@Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "不合格数量", example = "0")
private Double failQty;
@Column(name = "HOLD_QTY")
@Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "隔离数量", example = "0")
private Double holdQty;
@Column(name = "QC_QTY")
@Column(name = "QC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "质检中数量", example = "0")
private Double qcQty;
@Column(name = "RIN_QTY")
@Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "待入库数量", example = "0")
private Double rinQty;
@Column(name = "FREEZE_QTY")
@Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "冻结数量", example = "0")
private Double freezeQty;
@Column(name = "CONSIGN_QTY")
@Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "寄售数量", example = "0")
private Double consignQty;
@Column(name = "LOCK_QTY")
@Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "锁定数量", example = "0")
private Double lockQty;
@Column(name = "SCRAP_QTY")
@Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "报废数量", example = "0")
private Double scrapQty;

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

@ -109,7 +109,7 @@ public class WmsStockSn extends BaseBean {
@ApiParam(value = "单位")
private String unit;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "数量", example = "0")
private Double qty = 0d;

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

@ -64,12 +64,12 @@ public class WmsTaskDetails extends BaseBean {
@ApiParam(value = "供应商编号")
private String vendorNo;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "1")
private Double qty;
@Column(name = "TRANS_QTY")
@Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "处理数量", example = "1")
private Double transQty;

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

@ -58,7 +58,7 @@ public class WmsTrans extends BaseBean{
@ApiParam(value ="交易状态",example = "1")
private Integer transStatus;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value ="需求数")
private Double qty;

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

@ -98,47 +98,47 @@ public class WmsTransQuan extends BaseBean {
@ApiParam(value = "错误信息")
private String errorMessage;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "可用数量", example = "0")
public Double qty;
@Column(name = "FAIL_QTY")
@Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "不合格数量", example = "0")
private Double failQty;
@Column(name = "HOLD_QTY")
@Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "隔离数量", example = "0")
private Double holdQty;
@Column(name = "QC_QTY")
@Column(name = "QC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "质检中数量", example = "0")
private Double qcQty;
@Column(name = "RIN_QTY")
@Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "待入库数量", example = "0")
private Double rinQty;
@Column(name = "FREEZE_QTY")
@Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "冻结数量", example = "0")
private Double freezeQty;
@Column(name = "CONSIGN_QTY")
@Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "寄售数量", example = "0")
private Double consignQty;
@Column(name = "LOCK_QTY")
@Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "锁定数量", example = "0")
private Double lockQty;
@Column(name = "SCRAP_QTY")
@Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "报废数量", example = "0")
private Double scrapQty;

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

@ -58,7 +58,7 @@ public class WmsTransRcd extends BaseBean{
@ApiParam(value ="交易状态",example = "1")
private Integer transStatus;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value ="需求数")
private Double qty;

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

@ -66,12 +66,12 @@ public class WmsTransSn extends BaseBean {
@ApiParam("事务代码")
public String transCode;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "交易数量", example = "0")
public Double qty;
@Column(name="REJECT_QTY")
@Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "不合格交易数量", example = "0")
public Double rejectQty;

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

@ -37,7 +37,7 @@ public class WmsUnitConvert extends BaseBean {
@ApiParam(value = "目标单位")
private String destUnitCode;
@Column(name = "UNIT_COEFFICIENT")
@Column(name = "UNIT_COEFFICIENT", columnDefinition = "decimal(18,8)")
@ApiParam(value = "换算率")
private Double unitCoefficient;

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java
Unescape Escape View File

@ -63,7 +63,7 @@ public class WmsMoveDetailsSnapshot extends BaseBean {
@ApiParam("客户编号")
public String custNo;
@Column(name="TRANS_QTY")
@Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "处理数量", example = "0")
public Double transQty;
@ -71,7 +71,7 @@ public class WmsMoveDetailsSnapshot extends BaseBean {
return this.transQty == null ? 0 : this.transQty.doubleValue();
}
@Column(name="REJECT_QTY")
@Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "不合格处理数量", example = "0")
public Double rejectQty;

6
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java
Unescape Escape View File

@ -89,7 +89,7 @@ public class WmsMoveSnSnapshot extends BaseBean {
@ApiParam("容器编号")
public String packAgeNo;
@Column(name = "SRC_QTY")
@Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "源数量", example = "0")
public Double srcQty;
@ -126,12 +126,12 @@ public class WmsMoveSnSnapshot extends BaseBean {
@Transient
private Long finishedCounts;
@Column(name = "DEST_QTY")
@Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "目标数量", example = "0")
public Double destQty;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;

18
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java
Unescape Escape View File

@ -87,47 +87,47 @@ public class WmsStockQuanSnapshot extends BaseBean {
private WmsLocate wmsLocate;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "可用数量", example = "0")
public Double qty;
@Column(name = "FAIL_QTY")
@Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "不合格数量", example = "0")
private Double failQty;
@Column(name = "HOLD_QTY")
@Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "隔离数量", example = "0")
private Double holdQty;
@Column(name = "QC_QTY")
@Column(name = "QC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "质检中数量", example = "0")
private Double qcQty;
@Column(name = "RIN_QTY")
@Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "待入库数量", example = "0")
private Double rinQty;
@Column(name = "FREEZE_QTY")
@Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "冻结数量", example = "0")
private Double freezeQty;
@Column(name = "CONSIGN_QTY")
@Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "寄售数量", example = "0")
private Double consignQty;
@Column(name = "LOCK_QTY")
@Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "锁定数量", example = "0")
private Double lockQty;
@Column(name = "SCRAP_QTY")
@Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "报废数量", example = "0")
private Double scrapQty;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java
Unescape Escape View File

@ -116,7 +116,7 @@ public class WmsStockSnSnapshot extends BaseBean {
@ApiParam(value = "单位")
private String unit;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "数量", example = "0")
private Double qty = 0d;

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

@ -1533,19 +1533,13 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
DdlPreparedPack.getNumNOEqualPack(wmsStockSn.getPrinted(), "printed", result);
DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result);
DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result);
result.setOrderByStr(wmsStockSn.orderBy());
if(wmsStockSn.getPrinted()!= null){
if(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue() == wmsStockSn.getPrinted()){
DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue(),"printed",result);
}
}
getStringBuilderPack(wmsStockSn, result);
return result;
}
@ -2279,7 +2273,7 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result);
//数量大于0
DdlPreparedPack.getNumberBiggerPack(0, "qty", result);
DdlPreparedPack.getNumberBiggerPackContainsZero(0d, "qty", result);
DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
@ -2378,7 +2372,6 @@ public class WmsHqlPack {
}
/**
* 业务：库存查询封装
*

Write Preview
Loading…
Cancel
Save