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

PDA获取任务列表+盘点冻结根据移动明细源库位更新库存

Browse Source
yun-zuoyi
许心洁 6 years ago
parent a8a1c2fe8b
commit e3d5e5bb19
6 changed files with 91 additions and 39 deletions
Show Stats Download Patch File Download Diff File

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

@ -1761,6 +1761,15 @@ public class WmsEnumUtil {
public String getDescription() {
return description;
}
public static DATA_OBJ_TYPE codeOf(Integer val) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
}
/**

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

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.wms;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import java.io.Serializable;
/**
@ -16,19 +17,55 @@ import java.io.Serializable;
public class WmsTaskInfoModel implements Serializable {
@ApiParam("任务单号")
public String orderNo;
@ApiParam("关联单号")
public String refSrc;
@Column(name = "TRANS_TYPE_CODE")
/**
* 状态:1=创建,10=待处理,20=已处理
*/
@ApiParam(value = "任务状态")
public String taskStatus;
public Integer taskStatus;
@ApiParam("作业类型名称")
public String opTypeName;
@ApiParam(value = "交易类型代码")
private String transTypeCode;
@ApiParam("关联单号")
public String refSrc;
@ApiParam(value = "关联单据类型")
private String refType;
@Column(name = "ZDATE")
@ApiParam(value = "计划日期")
private String zdate;
@Column(name = "ZTIME")
@ApiParam(value = "计划时间")
private String ztime;
@Column(name = "CUST_NO")
@ApiParam(value = "客户编号")
private String custNo;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编号")
private String vendorNo;
public WmsTaskInfoModel() {
}
public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
String refType, String zdate, String ztime, String custNo, String vendorNo) {
this.orderNo = orderNo;
this.taskStatus = taskStatus;
this.opTypeName = opTypeName;
this.transTypeCode = transTypeCode;
this.refSrc = refSrc;
this.refType = refType;
this.zdate = zdate;
this.ztime = ztime;
this.custNo = custNo;
this.vendorNo = vendorNo;
}
}

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

@ -34,7 +34,7 @@ public class WmsDataAuth extends BaseBean {
@Column(name = "DATA_OBJ")
@ApiParam(value = "数据对象")
private String dataObj;
private Integer dataObj;
@Column(name = "DATA_OBJ_VALUE")
@ApiParam(value = "数据对象值")

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

@ -39,7 +39,7 @@ public class WmsDocMovementSn extends BaseBean {
@Column(name="ITEM")
@ApiParam("行号")
public String item;
public Integer item;
@Column(name="PART_NO")
@ApiParam("物料编码")

3
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java
Unescape Escape View File

@ -5,7 +5,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import java.util.List;
/**
@ -23,7 +22,7 @@ public class WmsDataAuthModel extends BaseBean {
private String roleCode;
@ApiParam("数据对象")
private String dataObj;
private Integer dataObj;
@ApiParam("数据对象值")
private String dataObjValue;

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

@ -170,6 +170,7 @@ public class WmsHqlPack {
/**
* 物流路线子表查询条件封装
*
* @param wmsRoutingDetail
* @return
*/
@ -201,6 +202,7 @@ public class WmsHqlPack {
/**
* 物流路线子表查询条件封装
*
* @param wmsRoutingAssign
* @return
*/
@ -651,6 +653,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result);
DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result);
DdlPreparedPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result);
DdlPreparedPack.getStringEqualPack(wmsTaskInfo.getTransTypeCode(), "transTypeCode", result);
getStringBuilderPack(wmsTaskInfo, result);
@ -859,6 +862,7 @@ public class WmsHqlPack {
return result;
}
/**
* 业务：库存表报查询封装
*
@ -871,14 +875,14 @@ public class WmsHqlPack {
HqlPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", findWhere);
HqlPack.getStringEqualPack(wmsStockQuan.getProdCfgTypeCode(), "prodCfgTypeCode", findWhere);
HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", findWhere);
if(wmsStockQuan.getZoneNo() != null){
HqlPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsStockQuan.getZoneNo().split(","))),","),"",findWhere);
if (wmsStockQuan.getZoneNo() != null) {
HqlPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsStockQuan.getZoneNo().split(","))), ","), "", findWhere);
//DdlPreparedPack.getInPackArray(wmsStockQuan.getZoneNo().split(","), "zoneNo", result);
}
if(wmsStockQuan.getPartNo() != null){
HqlPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsStockQuan.getPartNo().split(","))),","),"partNo",findWhere);
if (wmsStockQuan.getPartNo() != null) {
HqlPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsStockQuan.getPartNo().split(","))), ","), "partNo", findWhere);
}
if(!wmsStockQuan.getIncludeZeroStock()){
if (!wmsStockQuan.getIncludeZeroStock()) {
//含0库存显示，默认为否
//自定义条件，各汇总数量相加。为否时添加>0的条件判断
findWhere.append(" and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 ");
@ -894,22 +898,23 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsStockQuan.getProdCfgTypeCode(), "prodCfgTypeCode", result);
DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
if(wmsStockQuan.getZoneNo() != null){
if (wmsStockQuan.getZoneNo() != null) {
DdlPreparedPack.getInPackList(Arrays.asList(wmsStockQuan.getZoneNo().split(",")), "zoneNo", result);
}
if(wmsStockQuan.getPartNo() != null){
if (wmsStockQuan.getPartNo() != null) {
DdlPreparedPack.getInPackList(Arrays.asList(wmsStockQuan.getPartNo().split(",")), "partNo", result);
}
if(!wmsStockQuan.getIncludeZeroStock()){
if (!wmsStockQuan.getIncludeZeroStock()) {
//含0库存显示，默认为否
//自定义条件，各汇总数量相加。为否时添加>0的条件判断
result.setWhereAppend(result.getWhereAppend()+" and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 ");
result.setWhereAppend(result.getWhereAppend() + " and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 ");
}
getStringBuilderPack(wmsStockQuan, result);
return result;
}
/**
* 业务：物料包装查询封装
*
@ -1431,9 +1436,8 @@ public class WmsHqlPack {
*/
public static DdlPackBean packHqlWmsDataAuth(WmsDataAuth dataAuth, List<String> roleIds) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(dataAuth.getDataObj(), "dataObj", result);
DdlPreparedPack.getStringEqualPack(dataAuth.getOrganizeCode(),"organizeCode",result);
// String data = String.join(",", roleIds);
DdlPreparedPack.getNumEqualPack(dataAuth.getDataObj(), "dataObj", result);
DdlPreparedPack.getStringEqualPack(dataAuth.getOrganizeCode(), "organizeCode", result);
DdlPreparedPack.getInPackList(roleIds, "roleCode", result);
getStringBuilderPack(dataAuth, result);
return result;
@ -1493,13 +1497,14 @@ public class WmsHqlPack {
/**
* 把 List<Map> 中的一组数据重新封装到List<String>中
*
* @param mapList
* @param keyName
*/
private static List<String> cyclicTraversal(List<Map> mapList,String keyName) {
private static List<String> cyclicTraversal(List<Map> mapList, String keyName) {
List<String> list = new ArrayList<String>();
for(int i=0;i<mapList.size();i++){
Map<String,String> map = mapList.get(i);
for (int i = 0; i < mapList.size(); i++) {
Map<String, String> map = mapList.get(i);
list.add(map.get(keyName));
}
return list;
@ -1507,13 +1512,14 @@ public class WmsHqlPack {
/**
* 把 List<Map> 中的一组查询条件封装成 HQL
*
* @param mapList
* @param keyName
* @param columnName
* @param packBean
*/
private static void packMutilConditionHql(List<Map> mapList, String keyName,String columnName, DdlPackBean packBean) {
int index = 1;
private static void packMutilConditionHql(List<Map> mapList, String keyName, String columnName, DdlPackBean packBean) {
int index = 1;
String columnParam = null;
for (Map item : mapList) {
columnParam = columnName + String.valueOf(index);
@ -1532,7 +1538,7 @@ public class WmsHqlPack {
* @param orderList
* @return
*/
public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> orderList,Map<String, List<WmsDataAuth>> groupDataAuth) {
public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> orderList, Map<String, List<WmsDataAuth>> groupDataAuth) {
DdlPackBean packBean = new DdlPackBean();
Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
//拼sql
@ -1545,7 +1551,7 @@ public class WmsHqlPack {
if (StringUtils.isNotBlank(data)) {
List<Map> mapList = JSONObject.parseArray(data, Map.class);
if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.TRANS_TYPE.getValue() + "", key)) {
DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"TRANS_TYPE_CODE"), "transTypeCode", packBean);
DdlPreparedPack.getInPackList(cyclicTraversal(mapList, "TRANS_TYPE_CODE"), "transTypeCode", packBean);
//packMutilConditionHql(mapList, "TRANS_TYPE_CODE", "transTypeCode", packBean);
break;
}
@ -1580,8 +1586,8 @@ public class WmsHqlPack {
if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())) {
DdlPreparedPack.getStringEqualPack(wmsDataAuth.getRoleCode(), "roleCode", result);
}
if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObj())) {
DdlPreparedPack.getStringEqualPack(wmsDataAuth.getDataObj(), "dataObj", result);
if (wmsDataAuth.getDataObj() != null && wmsDataAuth.getDataObj().intValue() != 0) {
DdlPreparedPack.getNumEqualPack(wmsDataAuth.getDataObj(), "dataObj", result);
}
if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())) {
DdlPreparedPack.getStringRightLikerPack(wmsDataAuth.getDataObjValue(), "dataObjValue", result);
@ -1800,7 +1806,7 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
DdlPreparedPack.getStringNotNullPack("locateNo", result);
result.setWhereAppend(result.getWhereAppend()+" and locateNo != ''");
result.setWhereAppend(result.getWhereAppend() + " and locateNo != ''");
getStringBuilderPack(wmsStockSn, result);
@ -1814,7 +1820,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result);
result.setWhereAppend(result.getWhereAppend()+" and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 ");
result.setWhereAppend(result.getWhereAppend() + " and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 ");
getStringBuilderPack(wmsStockQuan, result);
return result;
@ -1888,6 +1894,7 @@ public class WmsHqlPack {
getStringBuilderPack(wmsVendorPart, result);
return result;
}
/**
* 主数据信息 分页查询
*
@ -1899,8 +1906,8 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result);
DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result);
DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(),"isValid",result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(), "isValid", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
// getStringBuilderPack(wmsProdCfgType, result);
return result;
}
@ -1930,11 +1937,11 @@ public class WmsHqlPack {
* @param wmsPart
* @return
*/
public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart,List<WmsStockSn> partNoList) {
public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart, List<WmsStockSn> partNoList) {
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getInPackList(partNoList.stream().map(part -> part.getPartNo()).collect(Collectors.toList()),"partNo",packBean);
DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(),"organizeCode",packBean);
DdlPreparedPack.getInPackList(partNoList.stream().map(part -> part.getPartNo()).collect(Collectors.toList()), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", packBean);
getStringBuilderPack(wmsPart, packBean);
return packBean;
@ -2002,11 +2009,11 @@ public class WmsHqlPack {
* 根据存储区编号集合、库位类型查询库位信息
*
* @param zoneNoList
*@param wmsZones
* @param wmsZones
* @param locateType
* @return
*/
public static DdlPackBean packLocateNoByZoneNo(List<String> zoneNoList , WmsZones wmsZones , Integer locateType) {
public static DdlPackBean packLocateNoByZoneNo(List<String> zoneNoList, WmsZones wmsZones, Integer locateType) {
DdlPackBean result = new DdlPackBean();
//查询参数封装

Write Preview
Loading…
Cancel
Save