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 4cf5fbc2b7 24af646ad8
commit 37efbf718e
7 changed files with 129 additions and 149 deletions
Show Stats Download Patch File Download Diff File

6
modules/i3plus-pojo-andon/pom.xml
Unescape Escape View File

@ -13,5 +13,11 @@
<artifactId>i3plus-pojo-andon</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-base</artifactId>
</dependency>
</dependencies>
</project>

38
modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java
Unescape Escape View File

@ -0,0 +1,38 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 安灯类型
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2019-05-10 17:16
* @Modify:
**/
@Data
@Entity
@Table(name="ANDON_ALARM_TYPE")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="安灯类型",description = "安灯类型")
public class AndonAlarmType extends BaseBean {
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
private String alarmCode;
@Column(name = "ALARM_NAME")
@ApiParam(value = "安灯类型名称")
private String alarmName;
}

16
modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description :对象持久层仓用方法控制(安灯类型信息)
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2019-05-10 17:27
* @Modify:
**/
@Repository
public interface IAndonAlarmTypeRepository extends BaseRepository<AndonAlarmType,Long> {
}

11
modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
Unescape Escape View File

@ -0,0 +1,11 @@
package cn.estsh.i3plus.pojo.andon.sqlpack;
/**
* @Description : 安灯对象查询封装
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2019-05-10 10:45
* @Modify:
**/
public class AndonHqlPack {
}

25
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java
Unescape Escape View File

@ -0,0 +1,25 @@
package cn.estsh.i3plus.pojo.sweb.modelbean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.Collections;
import java.util.List;
/**
* @Description : 待发布订单列表输出模型
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-04-02 13:13
* @Modify:
**/
@Data
public class SwebPOForPubListResultModelV2 extends BaseBean {
@ApiParam(value = "拆分请求时间数量列表", example = "1")
private List<String> reqTimeList = Collections.EMPTY_LIST;
@ApiParam(value = "列表", example = "1")
private List<SwebPOForPubListResultItemModel> list = Collections.EMPTY_LIST;
}

1
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
Unescape Escape View File

@ -121,7 +121,6 @@ public class SwebHqlPack {
public static DdlPackBean getPurchaseOrderDetailsPublishListStatusWhereHql(SwebPurchaseOrderDetails details) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);

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

@ -25,13 +25,6 @@ import java.util.stream.Collectors;
**/
public class WmsHqlPack {
public static String packInParams(String colnumName, String[] params) {
StringBuffer sb = new StringBuffer();
HqlPack.getInPackString(String.join(",", params), colnumName, sb);
HqlPack.getNumEqualPack(WmsEnumUtil.IS_PART.IS_ADJUST.getValue(), "snControl", sb);
return sb.toString();
}
/**
* 封装公用查询参数
*
@ -54,27 +47,6 @@ public class WmsHqlPack {
}
/**
* 封装公用查询参数
*
* @param bean 实体对象
* @param hqlStr 查询语句
* @return 封装完成的查询语句
*/
public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) {
// 判断工厂代码是否为空
if (StringUtils.isNotBlank(bean.getOrganizeCode())) {
HqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
}
// 封装有效状态和删除状态
HqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
return hqlStr.toString();
}
/**
* PO订单明细表 分页查询
*
* @param wmsPOMasterDetails
@ -202,14 +174,14 @@ public class WmsHqlPack {
* @param routingCode
* @return
*/
public static String packHqlWmsRoutingChildren(String routingCode) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlWmsRoutingChildren(String routingCode) {
DdlPackBean result = new DdlPackBean();
HqlPack.getStringEqualPack(routingCode, "routingCode", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
DdlPreparedPack.getStringEqualPack(routingCode, "routingCode", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
"isDeleted", result);
return result.toString();
return result;
}
@ -219,14 +191,14 @@ public class WmsHqlPack {
* @param wmsRoutingMaster
* @return
*/
public static String packHqlWmsRoutingMaster(WmsRoutingMaster wmsRoutingMaster) {
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result);
HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result);
public static DdlPackBean packHqlWmsRoutingMaster(WmsRoutingMaster wmsRoutingMaster) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result);
DdlPreparedPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result);
getStringBuilderPack(wmsRoutingMaster, result);
return result.toString();
return result;
}
/**
@ -235,18 +207,18 @@ public class WmsHqlPack {
* @param wmsPart
* @return
*/
public static String packHqlWmsPart(WmsPart wmsPart) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlWmsPart(WmsPart wmsPart) {
DdlPackBean result = new DdlPackBean();
HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
HqlPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result);
DdlPreparedPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
DdlPreparedPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result);
getStringBuilderPack(wmsPart, result);
return result.toString();
return result;
}
/**
@ -293,26 +265,6 @@ public class WmsHqlPack {
}
/**
* 库存交易记录信息 分页查询
*
* @param wmsTrans
* @return
*/
public static String packHqlWmsTrans(WmsTrans wmsTrans) {
StringBuffer result = new StringBuffer();
//查询参数封装
HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result);
HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result);
HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true);
getStringBuilderPack(wmsTrans, result);
return result.toString();
}
/**
* 供应商分页查询
*
* @param basVendor
@ -467,25 +419,6 @@ public class WmsHqlPack {
return result;
}
/**
* 供应商唯一性校验查询条件【用于添加和修改】
*
* @param basVendor
* @return
*/
public static DdlPackBean packHqlBasVendorUnique(BasVendor basVendor) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getNumNOEqualPack(basVendor.getId(), "id", result);
DdlPreparedPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result);
DdlPreparedPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result);
getStringBuilderPack(basVendor, result);
return result;
}
public static DdlPackBean packHqlWmsOpTypeUnique(WmsOpType wmsOpType) {
DdlPackBean result = new DdlPackBean();
@ -498,38 +431,6 @@ public class WmsHqlPack {
}
/**
* 查询满足处理周期的作业类型 查询条件封装
*
* @param wmsOpType
* @return
*/
public static String packHqlWmsOpTypeTime(WmsOpType wmsOpType) {
StringBuffer result = new StringBuffer();
getStringBuilderPack(wmsOpType, result);
result.append(" and isnull(model.lastTransTime) or timestampdiff(Minute,nvl(model.lastTransTime,'2000'),now()) >= model.cycleMins");
return result.toString();
}
/**
* 作业任务数据来源 查询条件封装
*
* @param wmsTaskSrc
* @return
*/
public static String packHqlWmsTaskSrc(WmsTaskSrc wmsTaskSrc) {
StringBuffer result = new StringBuffer();
//作业类型代码
HqlPack.getStringLikerPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result);
getStringBuilderPack(wmsTaskSrc, result);
return result.toString();
}
/**
* 客户信息 查询条件封装
*
* @param basCustomer
@ -805,25 +706,25 @@ public class WmsHqlPack {
* @param wmsAreaOwner 责任区分配信息
* @return 责任区分配信息
*/
public static String packHqlWmsAreaOwner(WmsAreaOwner wmsAreaOwner) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlWmsAreaOwner(WmsAreaOwner wmsAreaOwner) {
DdlPackBean result = new DdlPackBean();
// 仓库代码
HqlPack.getStringEqualPack(wmsAreaOwner.getWhNo(), "whNo", result);
DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getWhNo(), "whNo", result);
// 来源单据号
HqlPack.getStringEqualPack(wmsAreaOwner.getZoneNo(), "zoneNo", result);
DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getZoneNo(), "zoneNo", result);
// 供应商编码
HqlPack.getStringEqualPack(wmsAreaOwner.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getVendorNo(), "vendorNo", result);
// 物料编码
HqlPack.getStringEqualPack(wmsAreaOwner.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getPartNo(), "partNo", result);
// 负责人
HqlPack.getStringEqualPack(wmsAreaOwner.getOwnerUserNo(), "ownerUserNo", result);
DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getOwnerUserNo(), "ownerUserNo", result);
// 是否预分配
HqlPack.getNumEqualPack(wmsAreaOwner.getIsPreAssign(), "isPreAssign", result);
DdlPreparedPack.getNumEqualPack(wmsAreaOwner.getIsPreAssign(), "isPreAssign", result);
getStringBuilderPack(wmsAreaOwner, result);
return result.toString();
return result;
}
/**
@ -1374,22 +1275,6 @@ public class WmsHqlPack {
}
/**
* 按moveNo 取最后一笔插入的数据
*
* @param wmsMoveSn
* @return
*/
public static String packHqlLastWmsMoveSn(WmsMoveSn wmsMoveSn) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result);
getStringBuilderPack(wmsMoveSn, result);
HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
return result.toString();
}
/**
* 根据条件查询库存条码信息
*
* @param wmsStockSn
@ -1591,19 +1476,19 @@ public class WmsHqlPack {
* @param wmsTransModule
* @return
*/
public static String packHqlWmsTransModule(WmsTransModule wmsTransModule) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlWmsTransModule(WmsTransModule wmsTransModule) {
DdlPackBean result = new DdlPackBean();
if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) {
HqlPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result);
DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result);
}
if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) {
HqlPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result);
DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result);
}
if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) {
HqlPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result);
DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result);
}
getStringBuilderPack(wmsTransModule, result);
return result.toString();
return result;
}
/**

Write Preview
Loading…
Cancel
Save