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

库存报表业务改动以及bug修改

Browse Source
yun-zuoyi
shiyanghuan 6 years ago
parent af278555d0 019087fe48
commit b330676d61
15 changed files with 393 additions and 28 deletions
Show Stats Download Patch File Download Diff File

8
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java
Unescape Escape View File

@ -112,8 +112,12 @@ public class DynamicEntity extends BaseBean implements Serializable {
try {
val = getValue(propName,val);
// LOGGER.error("设置动态对象属性值 attr name:{} -> value:{} ",setMethodName,val);
Method setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()});
setMethod.invoke(this, val);
if(val != null){
Method setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()});
setMethod.invoke(this, val);
}else{
LOGGER.error("设置动态对象属性值 attr name:{} -> value:{} ",setMethodName,val);
}
} catch (NoSuchMethodException e) {
// LOGGER.error("没有方法：{}",setMethodName,e);
LOGGER.error("没有方法：{}",setMethodName);

74
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;
@ -2853,4 +2853,74 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
* 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)
public enum PDA_TOP_MENU {
RC("RC", "收货"),
QC("QC", "质检"),
PICK("PICK", "拣货"),
OUTSTOCK("OUTSTOCK", "出库"),
INSTOCK("INSTOCK", "入库"),
MOVESTOCK("MOVESTOCK", "移库"),
ASSIST("ASSIST", "辅助"),
NC("NC", "NC"),
CS("CS", "盘点");
private String value;
private String description;
PDA_TOP_MENU(String value, String description) {
this.value = value;
this.description = description;
}
public String getCode() {
return value;
}
public String getDescription() {
return description;
}
public String getValue() {
return value;
}
}
}

20
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJOBModel.java
Unescape Escape View File

@ -0,0 +1,20 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMaster;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description : JOB返回数据处理模型
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2019-07-03 15:50
* @Modify:
**/
@Data
public class WmsJOBModel implements Serializable {
private List<WmsMoveMasterModel> wmsMoveMasterModelList;
private String errorMessage;
}

56
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 : 平台对象封装
@ -96,20 +97,34 @@ public class CoreHqlPack {
* @param position
* @return
*/
public static String packHqlSysPosition(SysPosition position){
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlSysPosition(SysPosition position){
DdlPackBean result = new DdlPackBean();
// 查询参数封装
HqlPack.getNumEqualPack(position.getParentId(),"parentId",result);
HqlPack.getStringLikerPack(position.getName(),"name",result);
HqlPack.getStringLikerPack(position.getPositionCode(),"positionCode",result);
DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result);
DdlPreparedPack.getStringEqualPack(position.getName(),"name",result);
DdlPreparedPack.getStringEqualPack(position.getPositionCode(),"positionCode",result);
DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result);
// 添加默认排序
HqlPack.getOrderDefault(position);
return result;
}
return result.toString();
/**
* 岗位复杂查询
* @param position
* @return
*/
public static DdlPackBean packHqlSysPositionList(SysPosition position){
DdlPackBean result = new DdlPackBean();
// 查询参数封装
DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result);
return result;
}
/**
* 组织复杂查询
* @param organize
@ -132,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();
@ -770,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")

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

@ -58,14 +58,26 @@ public class WmsCSOrderMaster extends BaseBean {
@ApiParam(value = "是否允许清点", example = "1")
public Integer isInventory;
@Transient
@ApiParam(value = "盘点明细集")
public List<WmsCSOrderDetails> wmsCSOrderDetailsList;
@Column(name = "IS_TASK")
@ApiParam(value = "是否生产任务", example = "1")
public Integer isTask;
@Column(name = "IS_PART")
@ApiParam(value = "是否散件")
public Integer isPart;
@Column(name = "YEAR")
@ApiParam("年度")
public String year;
@Column(name = "IS_SYNC_ERP")
@ApiParam("是否同步ERP: 1=已同步，2=未同步")
public Integer isSyncErp;
@Transient
@ApiParam(value = "盘点明细集")
public List<WmsCSOrderDetails> wmsCSOrderDetailsList;
@Transient
@ApiParam(value = "盘点物料清单")
public String[] wmsCSParts;
@ -78,14 +90,6 @@ public class WmsCSOrderMaster extends BaseBean {
@ApiParam(value = "盘点库位清单")
public String[] wmsCSLocates;
@Column(name = "IS_PART")
@ApiParam(value = "是否散件")
private Integer isPart;
@Column(name = "YEAR")
@ApiParam("年度")
public String year;
public Integer getIsInventoryVal() {
return this.isInventory == null ? 0 :this.isInventory.intValue();
}

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();
}

6
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 : 库存信息
@ -142,6 +143,11 @@ public class WmsStockQuan extends BaseBean {
@ApiParam(value = "ERP库存地")
private String areaNo;
@Transient
@ApiParam(value = "存储区集合")
private List<String> zoneList;
public String getAreaNo() {
return areaNo;
}

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

@ -68,4 +68,8 @@ public class WmsTransType extends BaseBean {
@Transient
@ApiParam("菜单URL")
private String menuUrl;
public String getMenuUrl() {
return "/handle?transCode=" + this.transTypeCode;
}
}

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;
}

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

@ -118,7 +118,7 @@ public class WmsHqlPack {
DdlPackBean packBean = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean);
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
@ -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);
@ -1014,6 +1014,8 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result);
DdlPreparedPack.getNumEqualPack(wmsMoveSn.getItem(), "item", result);
DdlPreparedPack.getNumEqualPack(wmsMoveSn.getItemStatus(), "itemStatus", result);
DdlPreparedPack.getStringEqualPack(wmsMoveSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result);
DdlPreparedPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result);
@ -2000,6 +2002,7 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsUnit(WmsUnit wmsUnit) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsUnit.getOrganizeCode(), "organizeCode", result);
DdlPreparedPack.getStringLikerPack(wmsUnit.getUnitCode(), "unitCode", result);
DdlPreparedPack.getStringLikerPack(wmsUnit.getUnitName(), "unitName", result);
DdlPreparedPack.getNumEqualPack(wmsUnit.getUnitPrecision(), "unitPrecision", result);

Write Preview
Loading…
Cancel
Save