Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordView.jsp
===================================================================
diff -u -r17440 -r17454
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordView.jsp (.../washTransitionRecordView.jsp) (revision 17440)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordView.jsp (.../washTransitionRecordView.jsp) (revision 17454)
@@ -8,6 +8,10 @@
+ <%-- 引入common.js --%>
+
+ <%-- 引入语音插件 --%>
+
<%-- 引入本身的js --%>
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/action/WashTransitionRecordAction.java
===================================================================
diff -u -r17448 -r17454
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/action/WashTransitionRecordAction.java (.../WashTransitionRecordAction.java) (revision 17448)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/action/WashTransitionRecordAction.java (.../WashTransitionRecordAction.java) (revision 17454)
@@ -12,21 +12,17 @@
import com.forgon.disinfectsystem.entity.toussetransition.WashTransitionItem;
import com.forgon.disinfectsystem.entity.toussetransition.WashTransitionMaterial;
import com.forgon.disinfectsystem.entity.toussetransition.WashTransitionRecord;
-import com.forgon.disinfectsystem.washTransition.service.WashTransitionItemManager;
-import com.forgon.disinfectsystem.washTransition.service.WashTransitionMaterialManager;
import com.forgon.disinfectsystem.washTransition.service.WashTransitionRecordManager;
import com.forgon.entity.ExtJsEntity;
import com.forgon.tools.StrutsParamUtils;
import com.forgon.tools.StrutsResponseUtils;
import com.forgon.tools.db.DatabaseUtil;
-import com.forgon.tools.json.JSONUtil;
import com.forgon.tools.string.StringTools;
import com.forgon.tools.util.ExtJsUtil;
import com.forgon.tools.util.ForgonDateUtils;
import com.forgon.util.ExtGridUtils;
import com.opensymphony.xwork2.ModelDriven;
import com.opensymphony.xwork2.Preparable;
-import com.sun.org.apache.bcel.internal.generic.NEWARRAY;
@ParentPackage(value = "default")
@Namespace(value = "/disinfectSystem")
@@ -71,6 +67,12 @@
* @return
*/
public void loadWashTransitionRecordList() {
+ String idCardBarcode = StrutsParamUtils.getPraramValue("idCardBarcode", "");
+ String idCardBarcodeSql = "";
+ if (StringTools.isNotBlank(idCardBarcode)) { //扫描标识牌条码搜索
+ idCardBarcodeSql = String.format(" and t1.id in(select washTransitionRecordId from WashTransitionItem where idCardBarcode='%s') ", idCardBarcode);
+ }
+
String select = "select id,handover,takeover,transitionTime,tousseCount,materialCount ";
String where = "from("
+ "select t1.id,t1.handover,t1.takeover,t1.transitionTime,sum(t1.tousseCount) tousseCount,sum(t1.materialCount) materialCount "
@@ -83,7 +85,8 @@
+ "from WashTransitionRecord wtr join WashTransitionItem wti on wti.washTransitionRecordId=wtr.id "
+ "join WashTransitionMaterial wtm on wtm.washTransitionItemId=wti.id "
+ "group by wtr.id,wtr.handover,wtr.takeover,wtr.transitionTime,wti.tousseName "
- + ") t1 group by t1.id,t1.handover,t1.takeover,t1.transitionTime"
+ + ") t1 where 1=1 " + idCardBarcodeSql
+ + " group by t1.id,t1.handover,t1.takeover,t1.transitionTime"
+ ") temp where 1=1 "
;
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordView.js
===================================================================
diff -u -r17448 -r17454
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordView.js (.../washTransitionRecordView.js) (revision 17448)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordView.js (.../washTransitionRecordView.js) (revision 17454)
@@ -13,6 +13,21 @@
}
}
+/**
+ * 扫描标识牌条码请求数据
+ */
+function loadGrid(){
+ var idCardBarcode = Ext4.getCmp('idCardBarcode').getValue();
+ var barcodeReg = /(\d){9}/;
+ if (idCardBarcode.length == 9 && barcodeReg.test(idCardBarcode)) { //条码字符串为9数字,扫描码才有意义，否则清空
+ grid.extraParams.idCardBarcode = idCardBarcode;
+ Ext4.getCmp('forgonPagingToolBar').moveFirst(); //从第一页开始
+ } else {
+ showResult('请扫描正确的条码格式！');
+ }
+ Ext4.getCmp('idCardBarcode').setValue('');
+}
+
Ext4.onReady(function() {
var fields = [
{name : 'id', mapping : 'id'},
@@ -40,7 +55,24 @@
dataUrl : WWWROOT + '/disinfectSystem/washTransitionRecordAction!loadWashTransitionRecordList.do',
fields : fields,
columns : columns,
- sorters : { property : 'transitionTime', direction: 'DESC'}
+ sorters : { property : 'transitionTime', direction: 'DESC'},
+ extraParams : {}, //如果你要自定义参数，这里一定要先给一个空的对象，要不然会报空异常
+ tbar : [{
+ xtype : 'label',
+ text : '标识牌条码：'
+ },{
+ xtype : 'textfield',
+ name : 'idCardBarcode',
+ id : 'idCardBarcode',
+ enableKeyEvents : true,
+ listeners : {
+ keydown : function (thisTextfield, e, eOpts) {
+ if (e.keyCode == 13) {
+ loadGrid();
+ }
+ }
+ }
+ }]
});
var viewport = Ext4.create('Ext4.Viewport', {