Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
===================================================================
diff -u -r23132 -r23147
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java (.../GodownEntryItemManagerImpl.java) (revision 23132)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java (.../GodownEntryItemManagerImpl.java) (revision 23147)
@@ -140,6 +140,8 @@
hasBiologicalTestReport = GodownEntryItem.hasTypeOrDefault(hasBiologicalTestReport);
String hasInvoice = itemObject.optString("hasInvoice", null);//是否有发票
+ String qualifiedLabel = itemObject.optString("qualifiedLabel", null);//是否合格标签
+ String qualifiedCheck = itemObject.optString("qualifiedCheck", null);//是否合格验收
hasInvoice = GodownEntryItem.hasTypeOrDefault(hasInvoice);
String grade = itemObject.optString("grade", null);//类别
@@ -167,6 +169,8 @@
godownEntryItem.setProducingArea(producingArea);
godownEntryItem.setHasBiologicalTestReport(hasBiologicalTestReport);
godownEntryItem.setHasInvoice(hasInvoice);
+ godownEntryItem.setQualifiedCheck(qualifiedCheck);
+ godownEntryItem.setQualifiedLabel(qualifiedLabel);
godownEntryItem.setGrade(grade);
godownEntryItem.setBarcode(barcode);
godownEntryItem.setSupplierId(supplierId);//供应商id
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp
===================================================================
diff -u -r22690 -r23147
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp (.../godownEntryView.jsp) (revision 22690)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp (.../godownEntryView.jsp) (revision 23147)
@@ -19,6 +19,8 @@
var TYPE_IN = '<%=GodownEntry.TYPE_IN%>';
var HAS_TYPE_YES = '<%=GodownEntryItem.HAS_TYPE_YES%>';
var HAS_TYPE_NO = '<%=GodownEntryItem.HAS_TYPE_NO%>';
+var HAS_TYPE_PASS = '<%=GodownEntryItem.HAS_TYPE_PASS%>';
+var HAS_TYPE_DENY = '<%=GodownEntryItem.HAS_TYPE_DENY%>';
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
===================================================================
diff -u -r23132 -r23147
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 23132)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 23147)
@@ -160,6 +160,11 @@
data : [[HAS_TYPE_NO],[HAS_TYPE_YES]]
});
+var qualifiedStore = new Ext.data.SimpleStore({
+ fields : ['qualifiedType'],
+ data : [[HAS_TYPE_PASS],[HAS_TYPE_DENY]]
+});
+
//类别数据源
var gradeStore = new Ext.data.SimpleStore({
data:[['一类'],['二类'],['三类']],
@@ -190,7 +195,10 @@
{name : 'hasInvoice'},
{name : 'grade'},
{name : 'manufacturerId'},
- {name : 'supplierId'}
+ {name : 'supplierId'},
+ {name : 'qualifiedCheck'},
+ {name : 'qualifiedLabel'}
+
]);
/**
@@ -263,6 +271,9 @@
return false;
}
}
+ var qualifiedCheck = top.Ext.getCmp("qualifiedCheck").getValue();
+ var qualifiedLabel = top.Ext.getCmp("qualifiedLabel").getValue();
+
//添加操作
var godownEntryItem = new GodownEntryItemRecord({
@@ -287,7 +298,9 @@
hasInvoice : hasInvoice,
grade:grade,
manufacturerId : manufacturerId,
- supplierId : supplierId
+ supplierId : supplierId,
+ qualifiedCheck:qualifiedCheck,//标签合格
+ qualifiedLabel:qualifiedLabel//验收合格
});
//top.Ext.getCmp('godownEntryItemGrid').getStore().add(godownEntryItem);
top.Ext.getCmp('godownEntryItemGrid').getStore().insert(0 , godownEntryItem);
@@ -304,6 +317,8 @@
top.Ext.getCmp('sterileBatchNumber').setValue('');
top.Ext.getCmp('manufacturer').setValue('');
top.Ext.getCmp('certification').setValue('');
+// top.Ext.getCmp('qualifiedCheck').setValue('');
+// top.Ext.getCmp('qualifiedLabel').setValue('');
top.Ext.getCmp('name1').focus();
batchNumStore.baseParams.disposableGoodsID = '';
@@ -799,7 +814,9 @@
{name : 'hasInvoice'},
{name : 'grade'},
{name : 'manufacturerId'},
- {name : 'supplierId'}
+ {name : 'supplierId'},
+ {name : 'qualifiedCheck'},//标签合格
+ {name : 'qualifiedLabel'}//验收合格
]
})
}),
@@ -933,12 +950,14 @@
allowBlank : true
})
},
- {header : "注册证号",width : 230,dataIndex : 'certification',menuDisabled : true,
+ {header : "注册证号",width : 120,dataIndex : 'certification',menuDisabled : true,
editor : new top.Ext.form.TextField({
maxLength : 30,
allowBlank : true
})
},
+ {header : "标签合格",width : 80,menuDisabled : true,dataIndex : 'qualifiedLabel',hidden:!sstsConfig.godownEntryShowQualified},
+ {header : "验收合格",width : 80,menuDisabled : true,dataIndex : 'qualifiedCheck',hidden:!sstsConfig.godownEntryShowQualified},
{header : "总价",width : 70,menuDisabled : true,dataIndex : 'totalPrice', renderer:renderTotalPrice},
{header : "生物检测",width : 70,menuDisabled : true,dataIndex : 'hasBiologicalTestReport',
editor : new top.Ext.form.ComboBox({
@@ -1234,7 +1253,7 @@
xtype : 'dateextensiablefield',//dateextensiablefield
id : 'expDate1',
name : 'expDate1',
- width : 270,
+ width : 190,
minWidth : 190,
tabIndex : 6,
anchor : '95%',
@@ -1298,7 +1317,7 @@
typeAhead : false,
selectOnFocus :true,
allowBlank : true,
- width : 250,
+ width : 190,
tabIndex : 8,
listeners : {
select : function(field, r) {
@@ -1375,7 +1394,7 @@
typeAhead : false,
allowBlank : true,
selectOnFocus :true,
- width : 270,
+ width : 190,
tabIndex : 10,
listeners : {
select : function(field, r) {
@@ -1448,6 +1467,67 @@
editable:false,
width : 60
},{
+ text:'标签合格',
+ hidden:!sstsConfig.godownEntryShowQualified
+ },{
+ xtype : 'combo',
+ id : 'qualifiedLabel',
+ name : 'qualifiedLabel',
+ minChars : 0,
+ valueField : 'qualifiedType',
+ displayField : 'qualifiedType',
+ mode : 'local',
+ store : qualifiedStore,
+ forceSelection : true,
+ lazyInit : false,
+ triggerAction : 'all',
+ hideTrigger : false,
+ typeAhead : false,
+ selectOnFocus :true,
+ allowBlank : true,
+ editable:false,
+ width : 40,
+ tabIndex : 9,
+ hidden:!sstsConfig.godownEntryShowQualified,
+ listeners : {
+ render : function(field, e){
+ if(sstsConfig.godownEntryShowQualified){
+ field.setValue(HAS_TYPE_PASS);
+ }
+ }
+ }
+ },{
+ text:'验收合格',
+ hidden:!sstsConfig.godownEntryShowQualified
+ },{
+ xtype : 'combo',
+ id : 'qualifiedCheck',
+ name : 'qualifiedCheck',
+ minChars : 0,
+ valueField : 'qualifiedType',
+ displayField : 'qualifiedType',
+ mode : 'local',
+ store : qualifiedStore,
+ forceSelection : true,
+ lazyInit : false,
+ triggerAction : 'all',
+ hideTrigger : false,
+ typeAhead : false,
+ selectOnFocus :true,
+ allowBlank : true,
+ editable:false,
+ width : 40,
+ tabIndex : 9,
+ hidden:!sstsConfig.godownEntryShowQualified,
+ listeners : {
+ render : function(field, e){
+ if(sstsConfig.godownEntryShowQualified){
+ field.setValue(HAS_TYPE_PASS);
+ }
+ }
+
+ }
+ },{
text : '添加',
iconCls : 'btn_ext_add',
id:'addBtn',
@@ -1724,6 +1804,8 @@
supplierName : record.data.supplierName,
supplierId : record.data.supplierId,
manufacturerId : record.data.manufacturerId,
+ qualifiedLabel : record.data.qualifiedLabel,
+ qualifiedCheck : record.data.qualifiedCheck,
totalPrice: record.data.totalPrice
});
// console.log(items);
@@ -1789,7 +1871,7 @@
layout : 'fit',
title : '入库单信息',
width : 1020,
- height :550,
+ height :570,
modal : true,
// autoHeight : true,
border :false,
@@ -2108,7 +2190,9 @@
hasInvoice : action.result.data.itemsList[i].hasInvoice,
grade : action.result.data.itemsList[i].grade,
manufacturerId : action.result.data.itemsList[i].manufacturerId,
- supplierId : action.result.data.itemsList[i].supplierId
+ supplierId : action.result.data.itemsList[i].supplierId,
+ qualifiedCheck : action.result.data.itemsList[i].qualifiedCheck,
+ qualifiedLabel : action.result.data.itemsList[i].qualifiedLabel
});
top.Ext.getCmp('godownEntryItemGrid').getStore().add(godownEntryItem);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java
===================================================================
diff -u -r23130 -r23147
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java (.../GodownEntryItem.java) (revision 23130)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java (.../GodownEntryItem.java) (revision 23147)
@@ -27,6 +27,8 @@
public static final String HAS_TYPE_YES = "有";
public static final String HAS_TYPE_NO = "无";
+ public static final String HAS_TYPE_PASS = "是";
+ public static final String HAS_TYPE_DENY = "否";
private Long id;
@@ -185,6 +187,16 @@
*/
private String identification;
+ /**
+ * 是否合格标签(目前仅复大肿瘤使用)
+ */
+ private String qualifiedLabel;
+
+ /**
+ * 是否合格验收(目前仅复大肿瘤使用)
+ */
+ private String qualifiedCheck;
+
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
public Long getId() {
@@ -347,6 +359,23 @@
this.grade = grade;
}
+
+ public String getQualifiedLabel() {
+ return qualifiedLabel;
+ }
+
+ public void setQualifiedLabel(String qualifiedLabel) {
+ this.qualifiedLabel = qualifiedLabel;
+ }
+
+ public String getQualifiedCheck() {
+ return qualifiedCheck;
+ }
+
+ public void setQualifiedCheck(String qualifiedCheck) {
+ this.qualifiedCheck = qualifiedCheck;
+ }
+
public String getSupplierName() {
return supplierName;
}
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js
===================================================================
diff -u -r23133 -r23147
--- ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js (.../config.js) (revision 23133)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js (.../config.js) (revision 23147)
@@ -71,5 +71,7 @@
//一次性物品入库时是否需要联动采购计划单,默认为false
needGodownEntryLinkageGoodPurchase: true,
//采购计划显示入库状态,默认为false
- showGoodPurchaseStockStatus: true
+ showGoodPurchaseStockStatus: true,
+ //一次性物品入库单显示标签合格，验收合格选项,默认为false
+ godownEntryShowQualified:true
}
\ No newline at end of file