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 c75399c..15c744f 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 @@ -115,7 +115,8 @@ public class DynamicEntity extends BaseBean implements Serializable { Method setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()}); setMethod.invoke(this, val); } catch (NoSuchMethodException e) { - LOGGER.error("没有方法：{}",setMethodName,e); +// LOGGER.error("没有方法：{}",setMethodName,e); + LOGGER.error("没有方法：{}",setMethodName); } catch (IllegalAccessException e) { LOGGER.error("入参出错：{}:{}",val,val.getClass(),e); } catch (InvocationTargetException e) { 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 922eae5..e903261 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 @@ -2442,6 +2442,7 @@ public class WmsEnumUtil { public enum IMPORT_ORDER_TYPE { PO("PO", "要货计划"), ASN("ASN", "ASN"), + INSTRUCTIONS("INSTRUCTIONS", "指令"), SCATTERED_OUT("C00", "零星出库指令"), SCATTERED_INT("C01", "零星入指令"), NC_DISMANTLING_PICKING("C02", "NC拆解领料"), @@ -2778,11 +2779,11 @@ public class WmsEnumUtil { LOCK_QTY("lockQty", "锁定数量"), SCRAP_QTY("scrapQty", "报废数量"); - private String code; + private String value; private String description; - STOCK_QUAN_QTY_TYPE(String code, String description) { - this.code = code; + STOCK_QUAN_QTY_TYPE(String value, String description) { + this.value = value; this.description = description; } @@ -2791,16 +2792,16 @@ public class WmsEnumUtil { } public String getCode() { - return code; + return value; } public String getValue() { - return code; + return value; } public static STOCK_QUAN_QTY_TYPE codeOf(String code) { for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { + if (values()[i].value.equals(code)) { return values()[i]; } } @@ -2810,7 +2811,7 @@ public class WmsEnumUtil { public static String getDescription(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].code == code) { + if (values()[i].value == code) { tmp = values()[i].description; } } 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 f4a6151..511e343 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 @@ -56,7 +56,7 @@ public class BfElementProperty extends BaseBean { private String propertyTypeNameRdd; @Column(name="PROPERTY_NAME") - @ApiParam(value ="元素名称") + @ApiParam(value ="元素属性名称") private String propertyName; @Column(name="PROPERTY_CODE_RDD") @@ -137,6 +137,6 @@ public class BfElementProperty extends BaseBean { private BfDataObjectProperty objectProperty; public Object getFormValue() { - return propertyFormValue == null ? propertyDefaultValue: propertyFormValue; + return propertyFormValue; } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java index af3fb1d..6e8adc4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java @@ -40,10 +40,6 @@ public class SysRole extends BaseBean { @ApiParam(value ="资源描述") private String roleDescription; - @Column(name="ROLE_GRADE") - @ApiParam(value ="角色等级（待定）" , example ="-1") - private Integer roleGrade; - @Column(name="MODULE_NUMBER") @ApiParam(value ="权限模块数量" , example ="0" , access ="权限模块数量") private Integer moduleNumber; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java new file mode 100644 index 0000000..8d39279 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.wms.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 SAP_单据锁定表 + * @Reference + * @Author dragon + * @CreateDate 2019/6/29 18:04 + * @Modify + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SAP_ORDER_LOCK") +@Api("SAP_单据锁定") +public class WmsSapOrderLock extends BaseBean { + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; + + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + public String busiType; + + @Column(name = "ITEM") + @ApiParam("行号") + public String item; + + @Column(name = "LOCK_FLAG") + @ApiParam("锁定标识") + public String lockFlag; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSapOrderLockRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSapOrderLockRepository.java new file mode 100644 index 0000000..f1671a0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSapOrderLockRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsSapOrderLock; + +/** + * @Description SAP_单据锁定 DAO层接口 + * @Reference + * @Author dragon + * @CreateDate 2019/6/29 18:35 + * @Modify + */ +public interface WmsSapOrderLockRepository extends BaseRepository { +}