diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java index 0231497..ac21b0b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java @@ -176,7 +176,7 @@ public class DynamicEntity extends BaseBean implements Serializable { try { setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{f.getType()}); - System.out.println("Method Name:" + setMethod.getName() + "\t\t Value : " + fieldVal); +// System.out.println("Method Name:" + setMethod.getName() + "\t\t Value : " + fieldVal); setMethod.invoke(this, fieldVal); } catch (ClassCastException e) { e.printStackTrace(); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 86cae1c..c857b40 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -561,7 +561,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep + " as model where 1=1 " + packBean.getPackedHql()); for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter(key,packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get("m_" + key)); } return query.getResultList(); diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index fbedb77..9cb8bbc 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java @@ -52,6 +52,20 @@ public class BfDataObjectProperty extends BaseBean { @ApiParam(value ="数据对象类型") private Integer objectColumnType; + // 字段长度 + @ApiParam(value = "字段长度") + @Column(name="OBJECT_COLUMN_PRECISION") + private Integer objectColumnPrecision; + + // 字段精确长度 + @ApiParam(value = "字段精确长度") + @Column(name="OBJECT_COLUMN_SCALE") + private Integer objectColumnScale; + + @Column(name="OBJECT_COLUMN_TYPE_NAME") + @ApiParam(value ="数据对象类型名称") + private String objectColumnTypeName; + @Column(name="PROPERTY_NAME") @ApiParam(value ="类属性名称") private String propertyName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProcessRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProcessRepository.java new file mode 100644 index 0000000..620b24c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProcessRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProcess; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProcessRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteCfgRepository.java new file mode 100644 index 0000000..4c21991 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProdRouteCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdRouteCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteOptParamRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteOptParamRepository.java new file mode 100644 index 0000000..51a8c39 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteOptParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProdRouteOptParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdRouteOptParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessCellRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessCellRepository.java new file mode 100644 index 0000000..468d495 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessCellRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcessCell; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteProcessCellRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessRepository.java new file mode 100644 index 0000000..2f7b0aa --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteProcessRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessStepRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessStepRepository.java new file mode 100644 index 0000000..4391f26 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessStepRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcessStep; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteProcessStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteRepository.java new file mode 100644 index 0000000..a7e0fc9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesRoute; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepParamRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepParamRepository.java new file mode 100644 index 0000000..c29cda0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesStepParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesStepParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepRepository.java new file mode 100644 index 0000000..30726eb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesStep; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java index 766cd08..8ea9b89 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesArea; import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; import org.springframework.stereotype.Repository; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java index 6fcdd97..bf89b2a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter; import org.springframework.stereotype.Repository; diff --git a/modules/i3plus-pojo-model/i3plus-pojo-model.iml b/modules/i3plus-pojo-model/i3plus-pojo-model.iml index 97807fd..97faa2e 100644 --- a/modules/i3plus-pojo-model/i3plus-pojo-model.iml +++ b/modules/i3plus-pojo-model/i3plus-pojo-model.iml @@ -35,6 +35,7 @@ + diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java new file mode 100644 index 0000000..d39de03 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.model.form; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 数据操作Model + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2019-04-02 13:34 + * @Modify: + **/ +@Data +public class ElementFormModel { + + //外键关联数据对象主键 + @ApiParam(value = "元素ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long elementId; + + @ApiParam(value = "操作参数") + private String entity; + +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 23cb872..6f9eb24 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -1,10 +1,11 @@ package cn.estsh.i3plus.pojo.sweb.sqlpack; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.base.tool.SqlPack; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.sweb.bean.*; +import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel; import org.apache.commons.lang3.StringUtils; /** @@ -23,57 +24,70 @@ public class SwebHqlPack { * @param hqlStr * @return */ - private static String buildHql(BaseBean bean, StringBuffer hqlStr) { + private static DdlPackBean buildHql(BaseBean bean, DdlPackBean hqlStr) { // 判断工厂代码是否为空 if (StringUtils.isNotBlank(bean.getOrganizeCode())) { - SqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } // 封装有效状态和删除状态 Integer isValid = bean.getIsValid(); //默认查有效数据 if (isValid != null && isValid != 0) { - SqlPack.getNumEqualPack(isValid, "isValid", hqlStr); + DdlPreparedPack.getNumEqualPack(isValid, "isValid", hqlStr); } else { - SqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", hqlStr); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", hqlStr); } - SqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); - return hqlStr.toString(); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + return hqlStr; } - public static String getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); - HqlPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result); + public static DdlPackBean getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result); return buildHql(purchaseOrder, result); } - public static String getPackAgeWhereHql(SwebPackage swebPackage) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result); - HqlPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result); - HqlPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result); + public static DdlPackBean getPackageWhereHql(SwebPackage swebPackage) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result); + DdlPreparedPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result); + DdlPreparedPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result); return buildHql(swebPackage, result); } - public static String getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result); - HqlPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result); + public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result); + DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result); + DdlPreparedPack.timeBuilder(model.getRecTimeStart(), model.getRecTimeEnd(), "recTime", result, false); + // 封装有效状态和删除状态 + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + return buildHql(model, result); + } + + public static DdlPackBean getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result); return buildHql(swebProcurementPlanOrder, result); } - public static String getProcurementPlanOrderDeatilsWhereHql(SwebProcurementPlanOrderDetails swebProcurementPlanOrderDetails) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result); + public static DdlPackBean getProcurementPlanOrderDeatilsWhereHql(SwebProcurementPlanOrderDetails swebProcurementPlanOrderDetails) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result); return buildHql(swebProcurementPlanOrderDetails, result); } - public static String getVendorRelWhereHql(SwebVendorRel vendorRel) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result); - HqlPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result); + public static DdlPackBean getVendorRelWhereHql(SwebVendorRel vendorRel) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result); return buildHql(vendorRel, result); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index eccbdfa..9880db8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -10,6 +10,7 @@ import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import java.util.List; @@ -29,6 +30,7 @@ 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,6 +56,7 @@ public class WmsHqlPack { /** * 封装公用查询参数 + * * @param bean 实体对象 * @param hqlStr 查询语句 * @return 封装完成的查询语句 @@ -118,17 +121,20 @@ public class WmsHqlPack { * @param orderNos * @return */ - public static String packWmsOrderDetailsByOrderNos(String colName, List orderNos) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsOrderDetailsByOrderNos(String colName, List orderNos) { + DdlPackBean packBean = new DdlPackBean(); StringBuffer orderNoStr = new StringBuffer(); for (int i = 0; i < orderNos.size(); i++) { orderNoStr.append("'" + orderNos.get(i) + "',"); } orderNoStr.deleteCharAt(orderNoStr.length() - 1); - result.append(" and model.isDeleted=" + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() + - " and model.isValid=" + CommonEnumUtil.IS_VAILD.VAILD.getValue() + - " and model.orderNo in (" + orderNoStr + ")" + " order by model." + colName + ",model.orderNo"); - return result.toString(); + DdlPreparedPack.getInPack(orderNoStr.toString(), "orderNo", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); + DdlPreparedPack.getOrderByPack( + new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, + new String[]{colName, "orderNo"}, packBean); + return packBean; } /** @@ -184,8 +190,8 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "", - WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""),"poStatus",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isPart", result); + WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""), "poStatus", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); @@ -723,6 +729,7 @@ public class WmsHqlPack { /** * 根据条件查询打印机队列信息封装类 + * * @param wmsSnPrint 打印机队列信息 * @return 打印机队列信息 */ @@ -745,6 +752,7 @@ public class WmsHqlPack { /** * 盘点库位 条件封装 + * * @param wmsCSLocate * @return */ @@ -761,6 +769,7 @@ public class WmsHqlPack { /** * 盘点物料 条件封装 + * * @param wmsCSPart * @return */ @@ -779,6 +788,7 @@ public class WmsHqlPack { /** * 盘点存储区 条件封装 + * * @param wmsCSZone * @return */ @@ -795,6 +805,7 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 + * * @param wmsAreaOwner 责任区分配信息 * @return 责任区分配信息 */ @@ -821,6 +832,7 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 + * * @param wmsTempOrderLock 责任区分配信息 * @return 责任区分配信息 */ @@ -939,6 +951,7 @@ public class WmsHqlPack { /** * 内部单据：库存移动单主表唯一性查询 + * * @param wmsMoveMaster * @return */ @@ -956,6 +969,7 @@ public class WmsHqlPack { /** * 内部单据：库存移动单主表分页查询 + * * @param wmsMoveMaster * @return */ @@ -972,6 +986,7 @@ public class WmsHqlPack { /** * 内部单据：库存移动单明细表分页查询 + * * @param wmsMoveDetails * @return */ @@ -1002,6 +1017,7 @@ public class WmsHqlPack { /** * 内部单据：库存移动单条码信息分页查询 + * * @param wmsMoveSn * @return */ @@ -1054,8 +1070,8 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getInPack(String.join(",", WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue() + "", - WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue() + ""),"orderStatus",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isPart",result); + WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue() + ""), "orderStatus", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); //单号 HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsQCMaster, result); @@ -1483,6 +1499,7 @@ public class WmsHqlPack { /** * 根据权限数据拼查询任务详情sql + * * @param groupDataAuth * @return */ @@ -1521,14 +1538,15 @@ public class WmsHqlPack { /** * 给定字段动态in sql + * * @param columnName * @param vals * @return */ - public static String packHqlAndIn(WmsTaskInfo bean,String columnName,List vals) { + public static String packHqlAndIn(WmsTaskInfo bean, String columnName, List vals) { StringBuffer result = new StringBuffer(); String data = String.join(",", vals); - HqlPack.getInPackString(data,columnName,result); + HqlPack.getInPackString(data, columnName, result); HqlPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", result); getStringBuilderPack(bean, result); return result.toString(); @@ -1536,6 +1554,7 @@ public class WmsHqlPack { /** * 根据条件查询dataAuth + * * @param wmsDataAuth * @return */ @@ -1556,6 +1575,7 @@ public class WmsHqlPack { /** * 根据条件查询任务明细信息 + * * @param taskDetails * @return */ @@ -1603,6 +1623,7 @@ public class WmsHqlPack { /** * 根据条件查询系统配置信息 + * * @param wmsConfig * @return */