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

合并冲突pojo

Browse Source
yun-zuoyi
陈思洁 6 years ago
parent f0e0867e2c b330676d61
commit d47c9f8650
8 changed files with 265 additions and 5 deletions
Show Stats Download Patch File Download Diff File

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

@ -2906,6 +2906,7 @@ public class WmsEnumUtil {
ASSIST("ASSIST", "辅助"),
NC("NC", "NC"),
CS("CS", "盘点");
private String value;
private String description;

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

@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.platform.bean.*;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Description : 平台对象封装
@ -146,6 +147,17 @@ public class CoreHqlPack {
return result.toString();
}
public static DdlPackBean packHqlSysOrganize(SysOrganize organize,List<Long> idList){
DdlPackBean result = new DdlPackBean();
// String Like
DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result);
DdlPreparedPack.getStringLikerPack(organize.getName(),"organizeCode",result);
// Number In
DdlPreparedPack.getInPackList(idList,"id",result);
return result;
}
public static String packHqlSysOrganize(Long[] ids, Integer typeId){
StringBuffer result = new StringBuffer();
@ -784,4 +796,18 @@ public class CoreHqlPack {
return ddlPackBean;
}
/**
* 查询当前用户所有组织数据
* @param sysRefUserDepartments
* @return
*/
public static DdlPackBean packHqlSysOrganize(List<SysRefUserDepartment> sysRefUserDepartments){
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(d -> d.getOrganizeId()).collect(Collectors.toList()),"id",packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",packBean);
return packBean;
}
}

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")

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

@ -128,6 +128,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){
@ -152,4 +164,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;
}
}

75
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,31 @@ public class WmsStockQuan extends BaseBean {
@ApiParam(value = "总数量")
private Double totalQty;
@Transient
@ApiParam(value = "项目名称")
private String prodCfgTypeName;
@Transient
@ApiParam(value = "箱数", example = "-1")
private Integer boxQty;
@Transient
@ApiParam(value = "零件数", example = "-1")
private Double partQty;
@Transient
@ApiParam(value = "ERP库存地")
private String areaNo;
@Transient
@ApiParam(value = "存储区集合")
private List<String> zoneList;
public String getAreaNo() {
return areaNo;
}
public Double getQtyVal() {
return this.qty == null ? 0 : this.qty;
}
@ -166,6 +192,14 @@ public class WmsStockQuan extends BaseBean {
return this.totalQty == null ? 0 : this.totalQty;
}
public Double getPartQtyVal() {
return this.partQty == null ? 0 : this.partQty;
}
public Integer getBoxQtyVal() {
return this.boxQty == null ? 0 : this.boxQty;
}
public WmsStockQuan() {
}
@ -196,4 +230,45 @@ public class WmsStockQuan extends BaseBean {
this.lockQty = lockQty;
this.scrapQty = scrapQty;
}
public WmsStockQuan(String locateNo,Integer boxQty,Double partQty,String partNo,String partNameRdd, String unit,
Double sumQty, Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
this.locateNo = locateNo;
this.boxQty = boxQty;
this.partQty = partQty;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.unit = unit;
this.sumQty = sumQty;
this.qty = qty;
this.failQty = failQty;
this.holdQty = holdQty;
this.qcQty = qcQty;
this.rinQty = rinQty;
this.freezeQty = freezeQty;
this.consignQty = consignQty;
this.lockQty = lockQty;
this.scrapQty = scrapQty;
}
public WmsStockQuan(String whNo, String zoneNo, String locateNo,Integer boxQty,Double partQty,String partNo,String partNameRdd, String unit,
Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
this.whNo = whNo;
this.zoneNo = zoneNo;
this.locateNo = locateNo;
this.boxQty = boxQty;
this.partQty = partQty;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.unit = unit;
this.qty = qty;
this.failQty = failQty;
this.holdQty = holdQty;
this.qcQty = qcQty;
this.rinQty = rinQty;
this.freezeQty = freezeQty;
this.consignQty = consignQty;
this.lockQty = lockQty;
this.scrapQty = scrapQty;
}
}

8
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);
@ -2003,8 +2003,8 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsUnit.getOrganizeCode(), "organizeCode", result);
DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitCode(), "unitCode", result);
DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitName(), "unitName", result);
DdlPreparedPack.getStringLikerPack(wmsUnit.getUnitCode(), "unitCode", result);
DdlPreparedPack.getStringLikerPack(wmsUnit.getUnitName(), "unitName", result);
DdlPreparedPack.getNumEqualPack(wmsUnit.getUnitPrecision(), "unitPrecision", result);
getStringBuilderPack(wmsUnit, result);

Write Preview
Loading…
Cancel
Save