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 1e82aa4..5665951 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 @@ -1,21 +1,15 @@ package cn.estsh.i3plus.pojo.base.dynamic; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.google.common.base.CaseFormat; -import lombok.Getter; -import lombok.Setter; -import lombok.val; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import io.swagger.annotations.ApiParam; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.persistence.Transient; import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -32,15 +26,12 @@ public class DynamicEntity extends BaseBean implements Serializable { public static final Logger LOGGER = LoggerFactory.getLogger(DynamicEntity.class); - public String tableName; - /*private String uri; - private String method; - private Object[] args; - private Object result; - private String operator; - private String appName;*/ + private static final String ATTR_PREFIX = "$cglib_prop_"; + public String tableName; public List propertyList; + @ApiParam(value ="子集列表") + private List childList = new ArrayList<>(); public DynamicEntity(){ try { @@ -55,13 +46,6 @@ public class DynamicEntity extends BaseBean implements Serializable { this.tableName = tableName; } - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } /** * 初始化属性，以便动态加载 @@ -71,67 +55,13 @@ public class DynamicEntity extends BaseBean implements Serializable { */ public void initDynamic() { Field[] fields = this.getClass().getDeclaredFields(); - Method setMethod = null; - String setMethodName,propName; - Object fieldVal = null; - for(Field f : fields) { - propName = f.getName().replace("$cglib_prop_", ""); - if(!"LOGGER".equals(propName) && !"propertyList".equals(propName) && !"dynProperty".equals(propName)) { - this.getPropertyList().add(propName); //添加到属性list中 - setMethodName = "set" + propName.substring(0,1).toUpperCase() + propName.substring(1); - f.setAccessible(true); - try { - fieldVal = f.get(this); - } catch (IllegalAccessException e) { - fieldVal = null; - } - - if(fieldVal == null) { - if (f.getType() == Integer.class) { - fieldVal = 0; - } else if (f.getType() == Long.class) { - fieldVal = 0L; - } else if (f.getType() == Float.class) { - fieldVal = 0.0f; - } else if (f.getType() == Double.class) { - fieldVal = 0.0d; - } else if (f.getType() == String.class) { - fieldVal = ""; - }else if (f.getType() == Character.class) { - fieldVal = ""; - }else if (f.getType() == Boolean.class) { - fieldVal = true; - }else if (f.getType() == Byte.class) { - fieldVal = 0; - }else if (f.getType() == Date.class) { - fieldVal = new Date(); - }else { - fieldVal = ""; - } - } - - try { - setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{f.getType()}); -// System.out.println("Method Name:" + setMethod.getName() + "\t\t Value : " + fieldVal); - setMethod.invoke(this, fieldVal); - } catch (ClassCastException e) { - e.printStackTrace(); - LOGGER.error("ClassCastException ：{}", setMethodName, e); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - LOGGER.error("IllegalArgumentException ：{}", setMethodName, e); - } catch (NoSuchMethodException e) { - LOGGER.error("没有方法：{}", setMethodName, e); - } catch (IllegalAccessException e) { - LOGGER.error("入参出错：{}:{}:{}", f, f.getType(), fieldVal, e); - } catch (InvocationTargetException e) { - LOGGER.error("方法返回出错：{}", setMethodName, e); - }catch (RuntimeException e) { - LOGGER.error("RuntimeException ：{}", setMethodName, e); - }catch (Exception e) { - LOGGER.error("Exception ：{}", setMethodName, e); - } + String propName = f.getName().replace(ATTR_PREFIX, ""); + if (!isDefaultField(propName)) { + // 添加到属性list中 + this.getPropertyList().add(propName); + // 属性初始化 + setDynProperty(propName,getDynProperty(propName)); } } } @@ -140,31 +70,12 @@ public class DynamicEntity extends BaseBean implements Serializable { public String toString() { String result = "{"; - Object fieldVal = null; Field[] fields = this.getClass().getDeclaredFields(); - String fieldName; for(Field f : fields) { - fieldName = f.getName().replace("$cglib_prop_", ""); - if(!"LOGGER".equals(fieldName) && !"propertyList".equals(fieldName)) { - f.setAccessible(true); - fieldVal = new Object(); - try { - fieldVal = f.get(this); - } catch (IllegalAccessException e) { - fieldVal = null; - } - - if (fieldVal == null) { - if (f.getType() == Integer.class || f.getType() == Long.class) { - fieldVal = 0; - } else if (f.getType() == Float.class || f.getType() == Double.class) { - fieldVal = 0.0; - } else { - fieldVal = ""; - } - } + String fieldName = f.getName().replace(ATTR_PREFIX, ""); + if (!isDefaultField(fieldName)) { - result += "\"" + fieldName + "\":\"" + fieldVal + "\","; + result += "\"" + fieldName + "\":\"" + getDynProperty(fieldName) + "\","; } } if(fields.length > 0) { @@ -176,7 +87,6 @@ public class DynamicEntity extends BaseBean implements Serializable { return result; } - public void setDynProperty(Map params) { if (params != null && params.size() > 0){ params.forEach((k,v)->{{ @@ -187,7 +97,6 @@ public class DynamicEntity extends BaseBean implements Serializable { /** * 根据属性名，设置属性值 - * //TODO wei.peng 设置为空时会无效 * @param propName * @param val * @throws InvocationTargetException @@ -195,12 +104,10 @@ public class DynamicEntity extends BaseBean implements Serializable { * @throws NoSuchMethodException */ public void setDynProperty(String propName,Object val){ - //初始化set方法 - String setMethodName = "set" + CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, propName); - //获取方法 - Method setMethod = null; + String setMethodName = "set" + propName.substring(0,1).toUpperCase() + propName.substring(1); try { - setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()}); + val = getValue(propName,val); + Method setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()}); setMethod.invoke(this, val); } catch (NoSuchMethodException e) { LOGGER.error("没有方法：{}",setMethodName,e); @@ -211,23 +118,12 @@ public class DynamicEntity extends BaseBean implements Serializable { } } - /** - * 获取属性值 - * @param propName - * @return - * @throws NoSuchMethodException - * @throws InvocationTargetException - * @throws IllegalAccessException - */ public Object getDynProperty(String propName){ - //初始化set方法 String setMethodName = "get" + propName.substring(0,1).toUpperCase() + propName.substring(1); - + Object result = null; try { - //获取方法 Method getMethod = this.getClass().getDeclaredMethod(setMethodName); - //实现方法 - return getMethod.invoke(this); + result = getMethod.invoke(this); } catch (NoSuchMethodException e) { LOGGER.error("没有方法：{}:{}",setMethodName,propName,e); } catch (IllegalAccessException e) { @@ -235,7 +131,71 @@ public class DynamicEntity extends BaseBean implements Serializable { } catch (InvocationTargetException e) { LOGGER.error("方法返回出错：{}",setMethodName,e); } - return null; + return getValue(propName,result); + } + + /** + * 获取默认值 + * @param propName + * @param val + * @return + */ + public Object getValue(String propName,Object val){ + if(val == null){ + try { + Field field = this.getClass().getDeclaredField(ATTR_PREFIX + propName); + if (field.getType() == Integer.class) { + val = 0; + } else if (field.getType() == Long.class) { + val = 0L; + } else if (field.getType() == Float.class) { + val = 0.0f; + } else if (field.getType() == Double.class) { + val = 0.0d; + } else if (field.getType() == String.class) { + val = ""; + }else if (field.getType() == Character.class) { + val = ""; + }else if (field.getType() == Boolean.class) { + val = true; + }else if (field.getType() == Byte.class) { + val = 0; + }else if (field.getType() == Date.class) { + val = new Date(); + }else { + val = ""; + } + }catch (NoSuchFieldException e){ + LOGGER.error("没有指定属性：{}:{}",propName,e); + }catch (SecurityException e){ + LOGGER.error("获取属性安全错误：{}",propName,e); + } + } + return val; + } + + /** + * 是否是本类属性 + * @param fieldName + * @return + */ + public boolean isDefaultField(String fieldName){ + if (!ATTR_PREFIX.equals(fieldName)) { + if("propertyList".equals(fieldName) || "dynProperty".equals(fieldName) || "childList".equals(fieldName) + || "LOGGER".equals(fieldName)){ + return true; + } + } + return false; + } + + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; } public List getPropertyList() { @@ -245,4 +205,12 @@ public class DynamicEntity extends BaseBean implements Serializable { public void setPropertyList(List propertyList) { this.propertyList = propertyList; } + + public List getChildList() { + return childList; + } + + public void setChildList(List childList) { + this.childList = childList; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index c019b33..5cccafd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -832,6 +832,7 @@ public class BlockFormEnumUtil { PASSWORD(230, "PASSWORD", "密码"), DATE(300, "DATE", "日期(yyyy-MM-dd)"), DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), +// ELEMENT(700, "DICT_SELECT", "元素"), DICTIONARY(800, "DICT_SELECT", "字典"), CASCADE(900, "CASCADE", "级联"); //FILE(400, "file", "文件"), diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index 4152a72..4b2e9fc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -16,17 +16,19 @@ public class SwebEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_MASTER_STATUS { - CREATE(10, "新建"), - RECEIPT(20, "已发布"), - RECEIPT_FINISH(30, "已确认"), - CLOSED(40, "已打印"), - CANCELLED(50, "已发货"); + CREATE(10, "CREATE", "新建"), + RECEIPT(20, "RECEIPT", "已发布"), + SURE(30, "SURE", "已确认"), + PRINTED(40, "PRINTED", "已打印"), + DELIVERY(50, "DELIVERY", "已发货"); private int value; + private String code; private String description; - ORDER_MASTER_STATUS(int value, String description) { + ORDER_MASTER_STATUS(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -57,6 +59,16 @@ public class SwebEnumUtil { } return tmp; } + + public static int codeOf(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -64,17 +76,19 @@ public class SwebEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_DETAILS_STATUS { - CREATE(10, "新建"), - RECEIPT(20, "已发布"), - RECEIPT_FINISH(30, "已确认"), - CLOSED(40, "已打印"), - CANCELLED(50, "已发货"); + CREATE(10, "CREATE", "新建"), + RECEIPT(20, "RECEIPT", "已发布"), + SURE(30, "SURE", "已确认"), + PRINTED(40, "PRINTED", "已打印"), + DELIVERY(50, "DELIVERY", "已发货"); private int value; + private String code; private String description; - ORDER_DETAILS_STATUS(int value, String description) { + ORDER_DETAILS_STATUS(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -82,6 +96,10 @@ public class SwebEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } @@ -105,6 +123,16 @@ public class SwebEnumUtil { } return tmp; } + + public static int codeOf(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -145,14 +173,16 @@ public class SwebEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_TYPE { - STANDARD(10, "标准包装"), - NON_STANDARD(20, "非标包装"); + STANDARD(10, "STANDARD", "标准包装"), + NON_STANDARD(20, "NON_STANDARD", "非标准包装"); private int value; + private String code; private String description; - ORDER_TYPE(int value, String description) { + ORDER_TYPE(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -160,6 +190,10 @@ public class SwebEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 6a618b3..dd4ba2e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1810,6 +1810,11 @@ public class WmsEnumUtil { } return tmp; } + + //取反 + public static int getInvertValue(int val) { + return val == 1 ? 2 : 1; + } } /** diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index 3a2b46f..f4a6151 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -115,10 +115,9 @@ public class BfElementProperty extends BaseBean { @ApiParam(value = "控件显示格式") private String propertyControlFormat; - @Column(name = "PROPERTY_CONTROL_REF_ID") - @ApiParam(value = "控件引用RefId") - @JsonSerialize(using = ToStringSerializer.class) - private Long propertyControlRefId; + @Column(name = "PROPERTY_CONTROL_REF_KEY") + @ApiParam(value = "控件引用RefKey") + private String propertyControlRefKey; @Column(name = "PROPERTY_DESCRIPTION") @ApiParam(value = "属性描述") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java index 8883376..aefdef9 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java @@ -52,6 +52,10 @@ public class BfElementTree extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long treeAttrValueId; + @Column(name="TREE_IS_OPEN_ALL") + @ApiParam(value ="是否全部展开") + private Integer treeIsOpenAll; + @Column(name="TREE_DEFAULT_DIRECTION") @ApiParam(value ="树默认方向") private Integer treeDefaultDirection; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java index 6f59cbe..373f34e 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java @@ -61,9 +61,12 @@ public class BfMethodDetailProperty extends BaseBean { @Column(name="PRI_ELEMENT_PROPERTY_NAME_RDD") @ApiParam(value ="主对象元素属性名称") - @JsonSerialize(using = ToStringSerializer.class) private String priElementPropertyNameRdd; + @Column(name="PRI_ELEMENT_PROPERTY_CODE_RDD") + @ApiParam(value ="主对象元素属性code") + private String priElementPropertyCodeRdd; + // 枚举:BlockFormEnumUtil.TRIGGER_EVENT @Column(name="PRI_ELEMENT_EVENT") @ApiParam(value ="主对象元素事件") @@ -100,4 +103,8 @@ public class BfMethodDetailProperty extends BaseBean { @Column(name="SEC_ELEMENT_PROPERTY_NAME_RDD") @ApiParam(value ="关联对象元素属性名称") private String secElementPropertyNameRdd; + + @Column(name="SEC_ELEMENT_PROPERTY_CODE_RDD") + @ApiParam(value ="关联对象元素属性Code") + private String secElementPropertyCodeRdd; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java index 08b4fd5..e8cc46b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java @@ -1,9 +1,6 @@ package cn.estsh.i3plus.pojo.model.form; -import cn.estsh.i3plus.pojo.form.bean.BfButton; -import cn.estsh.i3plus.pojo.form.bean.BfLayout; -import cn.estsh.i3plus.pojo.form.bean.BfMethod; -import cn.estsh.i3plus.pojo.form.bean.BfMethodDetail; +import cn.estsh.i3plus.pojo.form.bean.*; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -54,4 +51,6 @@ public class FormModel { @ApiParam(value = "元素Model") private List elementModelList; + @ApiParam(value = "表单功能明细关联属性") + private List methodDetailPropertyRefList; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLotQCTransModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLotQCTransModel.java new file mode 100644 index 0000000..e6a8165 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLotQCTransModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 散件质检明细处理model + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-04-22 9:43 + * @Modify: + **/ +@Data +public class WmsLotQCTransModel implements Serializable { + private String orderNo; + private List wmsStockSnList; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java new file mode 100644 index 0000000..ccfef29 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.sweb.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 : sweb系统配置 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-19 11:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "SWEB_CONFIG") +@Api(value = "系统配置", description = "SWEB系统配置") +public class SwebConfig extends BaseBean { + + @Column(name = "NAME") + @ApiParam(value = "名称") + private String name; + + @Column(name = "CONFIG_TYPE") + @ApiParam(value = "参数类型ID（枚举：1.系统配置...）", example = "-1") + private Integer configType; + + @Column(name = "CONFIG_CODE") + @ApiParam(value = "参数代码") + private String configCode; + + // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP + @Column(name = "CONFIG_GROUP") + @ApiParam(value = "参数组") + private Integer configGroup; + + // 枚举 ImppEnumUtil.SYS_VALUE_TYPE + @Column(name = "CONFIG_VALUE_TYPE") + @ApiParam(value = "参数值类型") + private String configValueType; + + @Column(name = "CONFIG_VALUE") + @ApiParam(value = "参数值") + private String configValue; + + @Column(name = "CONFIG_DESCRIPTION") + @ApiParam(value = "参数描述") + private String configDescription; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java index dfa3f3e..2bb1f98 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java @@ -30,17 +30,17 @@ public class SwebOrderDeliveryLog extends BaseBean { @Column(name = "ORDER_ITEM_NO") @ApiParam("单据明细编号") - public String orderItemNo; + private String orderItemNo; @Column(name = "CAR_NO") @ApiParam(value = "发运车号") - public String carNo; + private String carNo; @Column(name = "CONTACT") @ApiParam("联系人") - public String contact; + private String contact; @Column(name = "CONTACT_TEL") @ApiParam(value = "联系人电话") - public String contactTel; + private String contactTel; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java index 7eadec2..83ad7ca 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java @@ -31,18 +31,18 @@ public class SwebPackage extends BaseBean { @Column(name="PACKAGE_NO") @ApiParam("包装编号") - public String packageNo; + private String packageNo; @Column(name="PACKAGE_TYPE_ID") @ApiParam(value = "包装类型", example = "1") - public Integer packTypeId; + private Integer packTypeId; @Column(name="PARENT_PACKAGE_NO") @ApiParam("上级包装编号") - public String parentPackageNo; + private String parentPackageNo; @ColumnDefault("0") @Column(name="PACKAGE_QTY") @ApiParam(value = "包装件数", example = "1") - public Integer packageQty; + private Integer packageQty; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java index 5f2434f..3e86f3d 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java @@ -31,7 +31,7 @@ public class SwebPurchaseChangeLog extends BaseBean { @Column(name = "ORDER_NO") @ApiParam("单据明细编号") - public String orderNo; + private String orderNo; @ApiParam(value = "零件号") @Column(name = "PART_NO") @@ -44,7 +44,7 @@ public class SwebPurchaseChangeLog extends BaseBean { @Column(name = "QTY") @ApiParam("零件数量") @ColumnDefault("0") - public Double qty; + private Double qty; @Column(name = "REMARK") @ApiParam("备注") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index 4927683..add54ef 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -48,72 +48,72 @@ public class SwebPurchaseOrder extends BaseBean { @ApiParam(value = "订单类型", example = "1") @Column(name = "ORDER_TYPE") - public Integer orderType; + private Integer orderType; @ApiParam(value = "订单状态", example = "1") @Column(name = "ORDER_STATUS") - public Integer orderStatus; + private Integer orderStatus; @Column(name = "PARENT_PACKAGE_NO") @ApiParam("上级包装编号") - public String parentPackageNo; + private String parentPackageNo; @Column(name = "DOCK") @ApiParam("道口") - public String dock; + private String dock; @Column(name = "ERP_WAREHOUSE") @ApiParam(value = "库存地") - public String erpWarehouse; + private String erpWarehouse; @Column(name = "PO_STATUS") @ApiParam(value = "PO状态", example = "1") - public Integer poStatus; + private Integer poStatus; @Column(name = "SHIP_TIME") @ApiParam(value = "发运时间") - public String shipTime; + private String shipTime; @Column(name = "PUBLISH_TIME") @ApiParam(value = "发布时间") - public String publishTime; + private String publishTime; @Column(name = "DELIVERY_TIME") @ApiParam(value = "交货时间") - public String deliveryTime; + private String deliveryTime; @Column(name = "REC_TIME") @ApiParam(value = "收货时间") - public String recTime; + private String recTime; @Column(name = "IS_SYN") @ApiParam(value = "是否收货", example = "2") - public Integer isSyn; + private Integer isSyn; @Column(name = "ORDER_TIME") @ApiParam(value = "订单时间") - public String orderTime; + private String orderTime; @Column(name = "REF_ORDER_NO") @ApiParam(value = "关联单号") - public String refOrderNo; + private String refOrderNo; @Column(name = "EXPECTED_TIME") @ApiParam(value = "预计到货时间") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - public String expectedTime; + private String expectedTime; @Column(name = "REF_NO") @ApiParam(value = "合同号") - public String refNo; + private String refNo; @Transient @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value = "预计到货时间 开始时间") - public String expectedTimeStart; + private String expectedTimeStart; @Transient @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value = "预计到货时间 结束时间") - public String expectedTimeEnd; + private String expectedTimeEnd; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index 3842ad7..3c8883e 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -31,7 +31,7 @@ public class SwebPurchaseOrderDetails extends BaseBean { @Column(name = "ORDER_NO") @ApiParam("单据号") - public String orderNo; + private String orderNo; @ApiParam("供应商编号") @Column(name = "VENDOR_CODE") @@ -169,7 +169,7 @@ public class SwebPurchaseOrderDetails extends BaseBean { @Column(name = "CONFIRM_TIME") @ApiParam(value = "确认时间") - public String confirmTime; + private String confirmTime; @Column(name = "DELIVERY_TIME") @ApiParam(value = "交货时间") @@ -177,5 +177,5 @@ public class SwebPurchaseOrderDetails extends BaseBean { @Column(name = "REF_NO") @ApiParam(value = "合同号") - public String refNo; + private String refNo; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index 0fb4abe..7b145f4 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -32,7 +32,7 @@ public class SwebPurchaseOrderSn extends BaseBean { @Column(name = "ORDER_NO") @ApiParam("单据明细编号") - public String orderNo; + private String orderNo; @Column(name = "PART_NO") @ApiParam(value = "零件号") @@ -81,15 +81,15 @@ public class SwebPurchaseOrderSn extends BaseBean { @Column(name = "CHECK_CODE") @ApiParam(value = "检验编号") - public String checkCode; + private String checkCode; @Column(name = "STOVE_NO") @ApiParam(value = "炉批号") - public String stoveNo; + private String stoveNo; @Column(name = "BATCH_NO") @ApiParam(value = "批次号") - public String batchNo; + private String batchNo; @ApiParam("是否同步") @Column(name = "IS_SYN") @@ -97,13 +97,13 @@ public class SwebPurchaseOrderSn extends BaseBean { @Column(name = "REC_TIME") @ApiParam(value = "收货时间") - public String recTime; + private String recTime; @Column(name = "PACKAGE_NO") @ApiParam(value = "包装编号") - public String packageNo; + private String packageNo; @Transient @ApiParam(value = "是否可编辑（前端使用）") - public boolean isSet = false; + private boolean isSet = false; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java new file mode 100644 index 0000000..95ad16e --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java @@ -0,0 +1,39 @@ +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.List; + +/** + * @Description : 订单批量新增输入模型 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-20 13:13 + * @Modify: + **/ +@Data +public class SwebPOBatchInsertEnterModel extends BaseBean { + + @ApiParam("单据号") + private String orderNo; + + @ApiParam("供应商编号") + private String vendorCode; + + @ApiParam("供应商名称") + private String vendorName; + + @ApiParam(value = "订单类型", example = "10") + private Integer orderType; + + @ApiParam(value = "库存地") + private String erpWarehouse; + + @ApiParam(value = "合同号") + private String refNo; + + @ApiParam(value = "零件列表") + private List partItems; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java new file mode 100644 index 0000000..954bda9 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java @@ -0,0 +1,103 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.ColumnDefault; + +import java.io.Serializable; + +/** + * @Description : 订单批量新增零件输入模型 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-20 13:13 + * @Modify: + **/ +@Data +public class SwebPOBatchInsertItemEnterModel implements Serializable { + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "零件名称") + private String partName; + + @ApiParam("供应商编号") + private String vendorCode; + + @ApiParam("供应商名称") + private String vendorName; + + @ApiParam(value = "订单类型", example = "10") + private Integer orderType = 0; + + @ApiParam(value = "行项目状态", example = "1") + private Integer itemStatus; + + @ApiParam(value = "箱数", example = "0") + private Integer boxQty = 0; + + @ApiParam(value = "默认包装规格", example = "0") + private Double snpQty = 0d; + + @ApiParam(value = "打印数", example = "0") + private Double printQty = 0d; + + @ApiParam(value = "收货数量", example = "0") + private Double recQty = 0d; + + @ApiParam(value = "已收箱数", example = "0") + private Double recBoxQty = 0d; + + @ApiParam(value = "上传数量", example = "0") + private Double uploadQty = 0d; + + @ApiParam("库存地") + private String erpWarehouse; + + @ApiParam(value = "订单数量", example = "0") + private Double refQty = 0d; + + @ColumnDefault("0") + @ApiParam(value = "需求数", example = "0") + private Double orderQty = 0d; + + @ApiParam(value = "发运数量", example = "0") + private Double shipQty = 0d; + + @ApiParam(value = "打印时间") + private String printTime; + + @ApiParam("打印用户code") + private String printUserCode; + + @ApiParam("是否为钢卷料") + private Integer isSteel; + + @ApiParam(value = "预计到货日期") + private String expectedTime; + + @ApiParam("备注") + private String remark; + + @ApiParam(value = "入库数量", example = "0") + private Double instockQty = 0d; + + @ApiParam(value = "入库箱数", example = "0") + private Double instockBoxQty = 0d; + + @ApiParam(value = "不良数", example = "0") + private Double ncQty = 0d; + + @ApiParam(value = "不良箱数", example = "0") + private Double ncBoxQty = 0d; + + @ApiParam(value = "行号", example = "0") + private Integer itemNo; + + @ApiParam(value = "确认时间") + private String confirmTime; + + @ApiParam(value = "交货时间") + private String deliveryTime; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebConfigRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebConfigRepository.java new file mode 100644 index 0000000..1d9a699 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebConfigRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebConfig; + +/** + * @Description :系统配置 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-19 14:51 + * @Modify: + **/ +public interface SwebConfigRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 09eeefb..15580ec 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 盘点实盘信息 @@ -92,4 +93,12 @@ public class WmsCSFactTrans extends BaseBean { @Column(name="REMARK") @ApiParam(value = "备注") public String remark; + + @Transient + @ApiParam(value = "剩余数量", example = "1") + public Double surplusQty; + + @Transient + @ApiParam("源库位编号") + public String srcLocateNo; } 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 f3b29c2..b6a45ce 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 @@ -33,6 +33,7 @@ public class WmsHqlPack { /** * 封装公用查询参数 + * * @param bean 实体对象 * @param hqlStr 查询语句 * @return 封装完成的查询语句 @@ -104,7 +105,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); - + HqlPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); getStringBuilderPack(wmsDocMovementDetails, result); return result.toString(); @@ -136,7 +137,6 @@ public class WmsHqlPack { */ public static DdlPackBean packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) { DdlPackBean packBean = new DdlPackBean(); -// StringBuffer result = new StringBuffer(); //查询参数封装 DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); @@ -272,62 +272,6 @@ public class WmsHqlPack { } /** - * 库位物料信息 分页查询 - * - * @param wmsLocatePart - * @return - */ - public static String packHqlWmsLocatePart(WmsLocatePart wmsLocatePart) { - StringBuffer result = new StringBuffer(); - - //查询参数封装 - HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result); - HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result); - - getStringBuilderPack(wmsLocatePart, result); - - return result.toString(); - } - - /** - * 库位信息 分页查询 - * - * @param wmsLocate - * @return - */ - public static DdlPackBean packHqlWmsLocates(WmsLocate wmsLocate) { - //查询参数封装 - DdlPackBean result = new DdlPackBean(); - - //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsLocate.getLocateNo(), "locateNo", result); - DdlPreparedPack.getStringLikerPack(wmsLocate.getLocateName(), "locateName", result); - DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); - DdlPreparedPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result); - DdlPreparedPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result); - DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result); - - getStringBuilderPack(wmsLocate, result); - - return result; - } - - /** - * 根据类型查询库位分页 - * - * @param wmsLocate - * @return - */ - public static String packHqlWmsLocatesByType(WmsLocate wmsLocate) { - StringBuffer result = new StringBuffer(); - //查询参数封装 - HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); - getStringBuilderPack(wmsLocate, result); - return result.toString(); - } - - /** * 交易类型信息 分页查询 * * @param wmsTransType @@ -365,23 +309,6 @@ public class WmsHqlPack { return result.toString(); } - /** - * 仓库分页查询条件 - * - * @param wareHouse - * @return - */ - public static String packHqlWareHouse(WareHouse wareHouse) { - StringBuffer result = new StringBuffer(); - - HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); - HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); - HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); - - getStringBuilderPack(wareHouse, result); - - return result.toString(); - } /** * 供应商分页查询 @@ -424,6 +351,24 @@ public class WmsHqlPack { } /** + * 仓库分页查询条件 + * + * @param wareHouse + * @return + */ + public static String packHqlWareHouse(WareHouse wareHouse) { + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); + HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); + HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); + + getStringBuilderPack(wareHouse, result); + + return result.toString(); + } + + /** * 仓库唯一性校验查询条件【用于添加和修改】 * * @param wareHouse @@ -442,6 +387,85 @@ public class WmsHqlPack { } /** + * 存储区信息 查询条件封装 + * + * @param wmsZones + * @return + */ + public static String packHqlWmsZones(WmsZones wmsZones) { + StringBuffer result = new StringBuffer(); + + //仓库代码 + HqlPack.getStringEqualPack(wmsZones.getWhNo(), "whNo", result); + //库存地代码 + HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); + //存储区代码 + HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); + //存储区名称 + HqlPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result); + + getStringBuilderPack(wmsZones, result); + + return result.toString(); + } + + /** + * 库位信息 分页查询 + * + * @param wmsLocate + * @return + */ + public static DdlPackBean packHqlWmsLocates(WmsLocate wmsLocate) { + //查询参数封装 + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateName(), "locateName", result); + DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); + DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result); + + getStringBuilderPack(wmsLocate, result); + + return result; + } + + /** + * 根据类型查询库位分页 + * + * @param wmsLocate + * @return + */ + public static String packHqlWmsLocatesByType(WmsLocate wmsLocate) { + StringBuffer result = new StringBuffer(); + //查询参数封装 + HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); + getStringBuilderPack(wmsLocate, result); + return result.toString(); + } + + /** + * 库位物料信息 分页查询 + * + * @param wmsLocatePart + * @return + */ + public static String packHqlWmsLocatePart(WmsLocatePart wmsLocatePart) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result); + HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result); + + getStringBuilderPack(wmsLocatePart, result); + + return result.toString(); + } + + /** * 供应商唯一性校验查询条件【用于添加和修改】 * * @param basVendor @@ -502,28 +526,6 @@ public class WmsHqlPack { return result.toString(); } - /** - * 存储区信息 查询条件封装 - * - * @param wmsZones - * @return - */ - public static String packHqlWmsZones(WmsZones wmsZones) { - StringBuffer result = new StringBuffer(); - - //仓库代码 - HqlPack.getStringLikerPack(wmsZones.getWhNo(), "whNo", result); - //库存地代码 - HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); - //存储区代码 - HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); - //存储区名称 - HqlPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result); - - getStringBuilderPack(wmsZones, result); - - return result.toString(); - } /** * 客户信息 查询条件封装 @@ -914,6 +916,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result); HqlPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result); + HqlPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result); HqlPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result); HqlPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result); @@ -1082,8 +1085,8 @@ public class WmsHqlPack { HqlPack.getNotInPack(String.join(",", WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue() + "", WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue() + ""), "snStatus", result); //单号 - HqlPack.getStringLeftLikerPack(wmsStockSn.getSn(),"sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getDateCode(),"dateCode",result); + HqlPack.getStringLeftLikerPack(wmsStockSn.getSn(), "sn", result); + HqlPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); getStringBuilderPack(wmsStockSn, result); return result.toString(); @@ -1271,6 +1274,7 @@ public class WmsHqlPack { /** * 作业流程分页查询 + * * @return */ public static DdlPackBean packHqlWmsActionGroup(WmsActionGroup wmsActionGroup) { @@ -1288,6 +1292,7 @@ public class WmsHqlPack { /** * 作业流程明细分页查询 + * * @return */ public static DdlPackBean packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails) { @@ -1303,6 +1308,7 @@ public class WmsHqlPack { return result; } + /** * 作业步骤调用参数信息 查询条件封装 * @@ -1619,6 +1625,7 @@ public class WmsHqlPack { /** * 查询脚本持久化 查询条件封装 + * * @return */ public static DdlPackBean packEngineScriptPersistence(EngineScriptPersistence scriptPersistence) {