igds-core/src/main/java/com/ld/igds/models/Building.java
@@ -36,10 +36,6 @@ @PropertyDef(label = "组织编码") private String companyId; @Column(name = "ggm", length = 50) @PropertyDef(label = "国规码") private String ggm; @Column(name = "DEPT_ID_", length = 40) @PropertyDef(label = "所属库点") private String deptId; igds-core/src/main/java/com/ld/igds/models/Depot.java
@@ -40,6 +40,10 @@ @Column(name = "DEPT_ID_", length = 40) @PropertyDef(label = "所属分库") private String deptId; @Column(name = "ggm", length = 50) @PropertyDef(label = "国规码") private String ggm; @Column(name = "NAME_", length = 50) @PropertyDef(label = "货位名称") @@ -112,7 +116,7 @@ @Column(name = "STORE_KEEPER_NAME_", length = 50) @PropertyDef(label = "保管员", description = "中文名称") private String storeKeeperName; @Column(name = "STORE_DATE_") @PropertyDef(label = "入库时间", description = "默认空，通过库存变更") private Date storeDate; igds-core/src/main/java/com/ld/igds/view/Building.view.xml
@@ -153,11 +153,6 @@ <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">ggm</Property> <Property name="property">ggm</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">deptId</Property> <Property name="property">deptId</Property> <Editor/> igds-core/src/main/java/com/ld/igds/view/Depot.view.xml
@@ -341,6 +341,11 @@ <Property name="trigger">autoMappingDropDown2</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">ggm</Property> <Property name="property">ggm</Property> <Editor/> </AutoFormElement> <Label layoutConstraint="colSpan:3"> <Property name="text">说明：1、实际储量调整请使用“库存管理”功能；2、仓状态：空仓、满仓、出入库中状态请使用“库存管理”功能</Property> <Property name="style"> igds-core/src/main/java/models/igds.model.xml
@@ -154,10 +154,6 @@ <Property name="valueProperty">name</Property> </Property> </PropertyDef> <PropertyDef name="ggm"> <Property></Property> <Property name="label">国规码</Property> </PropertyDef> </DataType> <DataType name="dtDepot"> <Property name="creationType">com.ld.igds.models.Depot</Property> @@ -316,6 +312,10 @@ <PropertyDef name="remark"> <Property></Property> <Property name="label">备注</Property> </PropertyDef> <PropertyDef name="ggm"> <Property/> <Property name="label">国规码</Property> </PropertyDef> </DataType> <DataType name="dtDepotStore"> @@ -604,23 +604,23 @@ <Property name="label">位置</Property> </PropertyDef> <PropertyDef name="modbus"> <Property/> <Property></Property> <Property name="label">Modbus配置</Property> </PropertyDef> <PropertyDef name="ext1"> <Property/> <Property></Property> <Property name="label">扩展字段1</Property> </PropertyDef> <PropertyDef name="ext2"> <Property/> <Property></Property> <Property name="label">扩展字段2</Property> </PropertyDef> <PropertyDef name="ext3"> <Property/> <Property></Property> <Property name="label">扩展字段3</Property> </PropertyDef> <PropertyDef name="statusName"> <Property/> <Property></Property> <Property name="label">当前状态</Property> </PropertyDef> </DataType> igds-manager/src/main/java/com/ld/igds/models/OAStaff.java
@@ -84,9 +84,9 @@ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date lzrq; @Column(name = "zidh", length = 16) @Column(name = "zjdh", length = 16) @PropertyDef(label = "座机电话") private String zidh; private String zjdh; @Column(name = "yddh", length = 16) @PropertyDef(label = "移动电话") igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
@@ -671,9 +671,10 @@ <Property name="trigger">listDropYN</Property> <Editor/> </AutoFormElement> <AutoFormElement> <AutoFormElement layoutConstraint="colSpan:2"> <Property name="name">remark</Property> <Property name="property">remark</Property> <Property name="editorType">TextArea</Property> <Editor/> </AutoFormElement> </AutoForm> igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml
@@ -6,35 +6,35 @@ <DataType name="dtMain"> <Property name="creationType">com.ld.igds.models.OAStaff</Property> <PropertyDef name="id"> <Property/> <Property></Property> <Property name="label">ID</Property> </PropertyDef> <PropertyDef name="companyId"> <Property/> <Property></Property> <Property name="label">组织编码</Property> </PropertyDef> <PropertyDef name="dwdm"> <Property/> <Property></Property> <Property name="label">单位代码</Property> </PropertyDef> <PropertyDef name="dwmc"> <Property/> <Property></Property> <Property name="label">单位名称</Property> </PropertyDef> <PropertyDef name="lsbm"> <Property/> <Property></Property> <Property name="label">隶属部门</Property> </PropertyDef> <PropertyDef name="xzqhdm"> <Property/> <Property></Property> <Property name="label">行政区划代码</Property> </PropertyDef> <PropertyDef name="xm"> <Property/> <Property></Property> <Property name="label">姓名</Property> </PropertyDef> <PropertyDef name="xb"> <Property/> <Property></Property> <Property name="label">性别</Property> <Property name="mapping"> <Property name="keyProperty">key</Property> @@ -54,7 +54,7 @@ </Property> </PropertyDef> <PropertyDef name="sfzhm"> <Property/> <Property></Property> <Property name="label">身份证号码</Property> </PropertyDef> <PropertyDef name="rzrq"> @@ -62,7 +62,7 @@ <Property name="label">入职日期</Property> </PropertyDef> <PropertyDef name="gwxz"> <Property/> <Property></Property> <Property name="label">岗位性质</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("GWXZ")}</Property> @@ -71,7 +71,7 @@ </Property> </PropertyDef> <PropertyDef name="zgzt"> <Property/> <Property></Property> <Property name="label">在岗状态</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("ZGZT")}</Property> @@ -80,24 +80,24 @@ </Property> </PropertyDef> <PropertyDef name="lzrq"> <Property/> <Property></Property> <Property name="label">离职日期</Property> <Property name="dataType">Date</Property> </PropertyDef> <PropertyDef name="zidh"> <Property/> <PropertyDef name="zjdh"> <Property></Property> <Property name="label">座机电话</Property> </PropertyDef> <PropertyDef name="yddh"> <Property/> <Property></Property> <Property name="label">移动电话</Property> </PropertyDef> <PropertyDef name="dzyx"> <Property/> <Property></Property> <Property name="label">电子邮箱</Property> </PropertyDef> <PropertyDef name="mz"> <Property/> <Property></Property> <Property name="label">民族</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("MZ")}</Property> @@ -106,7 +106,7 @@ </Property> </PropertyDef> <PropertyDef name="zzmm"> <Property/> <Property></Property> <Property name="label">政治面貌</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("ZZMM")}</Property> @@ -115,7 +115,7 @@ </Property> </PropertyDef> <PropertyDef name="rylb"> <Property/> <Property></Property> <Property name="label">人员类别</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("RYLB")}</Property> @@ -124,7 +124,7 @@ </Property> </PropertyDef> <PropertyDef name="zy"> <Property/> <Property></Property> <Property name="label">专业</Property> </PropertyDef> <PropertyDef name="qdzgzchzyzgsj"> @@ -132,7 +132,7 @@ <Property name="label">取得最高职称或职业资格时间</Property> </PropertyDef> <PropertyDef name="xl"> <Property/> <Property></Property> <Property name="label">学历</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("XL")}</Property> @@ -141,7 +141,7 @@ </Property> </PropertyDef> <PropertyDef name="zw"> <Property/> <Property></Property> <Property name="label">职务</Property> </PropertyDef> <PropertyDef name="updateTime"> @@ -402,8 +402,8 @@ <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">zidh</Property> <Property name="property">zidh</Property> <Property name="name">zjdh</Property> <Property name="property">zjdh</Property> <Editor/> </AutoFormElement> <AutoFormElement> igds-recir/src/main/java/com/ld/igds/drug/service/DrugRowMapper.java
@@ -14,7 +14,7 @@ Drug data = new Drug(); data.setId(rs.getString("ID_")); data.setCompanyId(rs.getString("COMPANY_ID_")); data.setCount(rs.getInt("COUNT_")); data.setCount(rs.getDouble("COUNT_")); data.setDosage(rs.getString("DOSAGE_")); data.setName(rs.getString("NAME_")); // data.setSpec(rs.getString("SPEC_")); igds-recir/src/main/java/com/ld/igds/models/Drug.java
@@ -108,7 +108,7 @@ @Column(name = "COUNT_") @PropertyDef(label = "库存量") private int count = 0; private Double count = 0.0; @Column(name = "kcsldw", length = 1) @PropertyDef(label = "库存量单位", description = "1(默认)：公斤；2：克；3：毫升；") igds-recir/src/main/java/models/recir.model.xml
@@ -25,9 +25,10 @@ <Property name="required">true</Property> </PropertyDef> <PropertyDef name="count"> <Property name="dataType">int</Property> <Property name="dataType">Double</Property> <Property name="label">库存量</Property> <Property name="required">true</Property> <Property name="displayFormat">#0.000000</Property> </PropertyDef> <PropertyDef name="updateUser"> <Property></Property>
