diff --git a/erp_web/pages/manage/serialNumber.html b/erp_web/pages/manage/serialNumber.html index 88152f4b..b586e8d7 100644 --- a/erp_web/pages/manage/serialNumber.html +++ b/erp_web/pages/manage/serialNumber.html @@ -189,12 +189,13 @@ columns: [[ {field: 'id', width: 35, align: "center", checkbox: true}, {field: 'depotheadId', hidden: true}, + {field: 'depotHeadType', hidden: true}, { title: '操作', field: 'op', align: "center", width: 60, formatter: function (value, rec) { var str = ''; var rowInfo = rec.id + 'AaBb' + rec.materialId + 'AaBb' + rec.materialName + 'AaBb' + rec.serialNumber + 'AaBb' + rec.isSell + 'AaBb' + rec.remark + 'AaBb' + rec.deleteFlag + 'AaBb' + rec.createTime + 'AaBb' + rec.updateTime + 'AaBb' + rec.creator + 'AaBb' + rec.updater - + 'AaBb' + rec.creatorName + 'AaBb' + rec.updaterName +'AaBb' + rec.depotheadId+'AaBb' + rec.depotHeadNumber; + + 'AaBb' + rec.creatorName + 'AaBb' + rec.updaterName +'AaBb' + rec.depotheadId+'AaBb' + rec.depotHeadNumber +'AaBb' + rec.depotHeadType; str += '   '; str += ''; return str; @@ -202,7 +203,12 @@ }, {title: '商品名称', align: "center",field: 'materialName', width: 100}, {title: '序列号',align: "center", field: 'serialNumber', width: 200}, - {title: '单据编号', align: "center", field: 'depotHeadNumber', width: 200}, + {title: '单据编号', align: "center", field: 'depotHeadNumber', width: 140, + formatter: function (value, row) { + return "" + + row.depotHeadNumber + ""; + } + }, {title: '已卖出', align: "center", field: 'isSell', width: 60 , formatter: function (value) { return value=='1' ? "是" : "否"; } diff --git a/src/main/java/com/jsh/erp/datasource/entities/SerialNumberEx.java b/src/main/java/com/jsh/erp/datasource/entities/SerialNumberEx.java index 4077e9b9..218adde6 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/SerialNumberEx.java +++ b/src/main/java/com/jsh/erp/datasource/entities/SerialNumberEx.java @@ -21,6 +21,8 @@ public class SerialNumberEx extends SerialNumber{ private String updaterName; /**单据编号*/ private String depotHeadNumber; + /**单据类型(出库入库)*/ + private String depotHeadType; public String getMaterialName() { return materialName; @@ -53,4 +55,12 @@ public class SerialNumberEx extends SerialNumber{ public void setDepotHeadNumber(String depotHeadNumber) { this.depotHeadNumber = depotHeadNumber; } + + public String getDepotHeadType() { + return depotHeadType; + } + + public void setDepotHeadType(String depotHeadType) { + this.depotHeadType = depotHeadType; + } } diff --git a/src/main/resources/mapper_xml/SerialNumberMapperEx.xml b/src/main/resources/mapper_xml/SerialNumberMapperEx.xml index 1a105cdb..3b324680 100644 --- a/src/main/resources/mapper_xml/SerialNumberMapperEx.xml +++ b/src/main/resources/mapper_xml/SerialNumberMapperEx.xml @@ -7,12 +7,13 @@ +