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
曾贞一 6 years ago
parent 71087e5d43 0c841b645e
commit 019087fe48
10 changed files with 259 additions and 5 deletions
Show Stats Download Patch File Download Diff File

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

@ -502,8 +502,8 @@ public class WmsEnumUtil {
SUPPLIER_RETURN_SMRR(190, "SUPPLIER_RETURN_SMRR", "供应商退货(SMRR)"),
NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"),
NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"),
LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库");
LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库"),
AMPR(190, "AMPR", "AMPR");
private int value;
private String code;
@ -2855,6 +2855,40 @@ public class WmsEnumUtil {
}
/**
* ERP同步标识 10=待同步，20=同步成功，30=同步失败
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WMS_SN_GENERATE_RULE {
SOURCE(10, "源"), TARGET(20, "目标"), NON_ASSIGNMENT(30, "不赋值");
private int value;
private String description;
WMS_SN_GENERATE_RULE(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;
}
}
/**
* PDA顶级菜单
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -2868,6 +2902,7 @@ public class WmsEnumUtil {
ASSIST("ASSIST", "辅助"),
NC("NC", "NC"),
CS("CS", "盘点");
private String value;
private String description;

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

@ -36,7 +36,7 @@ public class WmsASNMaster extends BaseBean {
@Column(name = "ASN_TYPE")
@ApiParam("单据类型")
public String asnType;
public Integer asnType;
@Column(name = "ASN_STATUS")
@ApiParam(value = "状态", example = "0")

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

@ -210,4 +210,16 @@ public class WmsDocMovementDetails extends BaseBean {
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public transient Integer lockVersion;
@Transient
@ApiParam("移动类型")
public Integer moveType;
@Transient
@ApiParam("业务类型")
public Integer busiType;
@Column(name = "IS_SN")
@ApiParam(value = "条码生成状态", example = "1")
public Integer isSn;
}

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

@ -124,6 +124,18 @@ public class WmsMoveDetails extends BaseBean {
@Transient
private Long finishedCounts;
@Transient
@ApiParam("交易类型")
private String transTypeCode;
@Transient
@ApiParam("erp库存地")
private String ZoneNo;
@Transient
@ApiParam("条码")
private String sn;
public WmsMoveDetails(){}
public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){
@ -148,4 +160,32 @@ public class WmsMoveDetails extends BaseBean {
public Long getFinishedCounts() {
return finishedCounts == null ? 0L : this.finishedCounts;
}
public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode,
Integer itemStatus,String unit,String srcWhNo,
String srcZoneNo,String srcLocateNo,String destWhNo, String destZoneNo, String destLocateNo,
Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo){
this.organizeCode = organizeCode;
this.partNo = partNo;
this.orderNo = orderNo;
this.item = item;
this.partNameRdd = partNameRdd;
this.transTypeCode = transTypeCode;
this.itemStatus = itemStatus;
this.unit = unit;
this.srcWhNo = srcWhNo;
this.srcZoneNo = srcZoneNo;
this.srcLocateNo = srcLocateNo;
this.destWhNo = destWhNo;
this.destZoneNo = destZoneNo;
this.destLocateNo = destLocateNo;
this.transQty = transQty;
this.rejectQty = rejectQty;
this.refSrc = refSrc;
this.vendorNo = vendorNo;
this.custNo = custNo;
}
}

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

@ -65,4 +65,90 @@ public class WmsMoveMaster extends BaseBean {
@Column(name = "BUSI_TYPE_CODE")
@ApiParam(value = "业务类型编码")
private Integer busiTypeCode;
@Transient
@ApiParam("物料编码")
private String partNo;
@Transient
@ApiParam("状态")
private Integer itemStatus;
@Transient
@ApiParam("erp库存地")
private String ZoneNo;
@Transient
@ApiParam("关联单号")
private String refSrc;
@Transient
@ApiParam("目标仓库")
private String destWhNo;
@Transient
@ApiParam("存储区")
private String destZoneNo;
@Transient
@ApiParam("供应商编码")
private String vendorNo;
@Transient
@ApiParam("条码")
private String sn;
@Transient
@ApiParam("物料名称")
private String partNameRdd;
@Transient
@ApiParam("单位")
private String unit;
@Transient
@ApiParam("源仓库")
private String srcWhNo;
@Transient
@ApiParam("源存储区代码")
private String srcZoneNo;
@Transient
@ApiParam("处理数量")
private Double transQty;
@Transient
@ApiParam("不合格处理数量")
private Double rejectQty;
@Transient
@ApiParam("库位")
private String destLocateNo;
public WmsMoveMaster(){};
public WmsMoveMaster(String organizeCode,String partNo,String partNameRdd,String transTypeCode,Integer itemStatus,
String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty) {
this.organizeCode = organizeCode;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.transTypeCode = transTypeCode;
this.itemStatus = itemStatus;
this.unit = unit;
this.srcWhNo = srcWhNo;
this.srcZoneNo = srcZoneNo;
this.destWhNo = destWhNo;
this.destZoneNo = destZoneNo;
this.transQty = transQty;
this.rejectQty = rejectQty;
}
}

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

@ -165,6 +165,14 @@ public class WmsMoveSn extends BaseBean {
@ApiParam("关联单号")
public String refSrc;
@Transient
@ApiParam("erp库存地")
private String ZoneNo;
@Transient
@ApiParam("供应商编码")
private String vendorNo;
public WmsMoveSn(){}
public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){
@ -196,4 +204,28 @@ public class WmsMoveSn extends BaseBean {
this.transTypeCode = transTypeCode;
this.refSrc = refSrc;
}
public WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,
String transTypeCode,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus,
Integer destSnStatus, String lotNo,String dateCode){
this.organizeCode=organizeCode;
this.orderNo=orderNo;
this.item=item;
this.partNo=partNo;
this.partNameRdd=partNameRdd;
this.transTypeCode=transTypeCode;
this.itemStatus=itemStatus;
this.unit=unit;
this.srcLocateNo=srcLocateNo;
this.destLocateNo=destLocateNo;
this.srcQty=srcQty;
this.srcQty=srcQty;
this.destQty=destQty;
this.srcQcStatus=srcQcStatus;
this.descQcStatus=descQcStatus;
this.srcSnStatus=srcSnStatus;
this.destSnStatus=destSnStatus;
this.lotNo=lotNo;
this.dateCode=dateCode;
}
}

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

@ -151,6 +151,10 @@ public class WmsPart extends BaseBean {
@ApiParam("库存水平")
private String stockLevelStatus;
@Column(name = "IS_PROD_LOT")
@ApiParam(value = "是否录入生产批次", example = "1")
private Integer isProdLot;
public int getIqcValue(){
return this.iqc == null ? 0 : this.iqc.intValue();
}

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

@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.util.List;
/**
* @Description : 库存信息
@ -126,6 +127,10 @@ public class WmsStockQuan extends BaseBean {
@ApiParam(value = "总数量")
private Double totalQty;
@Transient
@ApiParam(value = "存储区集合")
private List<String> zoneList;
public Double getQtyVal() {
return this.qty == null ? 0 : this.qty;
}

40
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java
Unescape Escape View File

@ -0,0 +1,40 @@
package cn.estsh.i3plus.pojo.wms.engine.rule;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class GenerateSnRule {
/**
* 业务类型 130
*/
private Integer busiType;
/**
* 是否允许生成条码
*/
private Integer isGenerateSn;
/**
* 条码状态
*/
private Integer snStatus;
/**
* 质量状态
*/
private Integer qcStatus;
/**
* 仓库来源
*/
private Integer whSource;
/**
* 存储区来源
*/
private Integer zoneSource;
}

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

@ -521,7 +521,7 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringRightLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result);
DdlPreparedPack.getNumEqualPack(wmsASNMaster.getAsnType(), "asnType", result);
DdlPreparedPack.getNumEqualPack(wmsASNMaster.getAsnStatus(), "asnStatus", result);
DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result);
@ -821,9 +821,9 @@ public class WmsHqlPack {
public static DdlPackBean packWmsStockQuan(WmsStockQuan wmsStockQuan) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getInPackList(wmsStockQuan.getZoneList(),"zoneNo",result);
//查询参数封装
DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result);

Write Preview
Loading…
Cancel
Save