Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r26563 -r26611
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 26563)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 26611)
@@ -3455,6 +3455,10 @@
}
if(invoicePlan instanceof RecyclingApplication){
RecyclingApplication recyclingApplication = (RecyclingApplication)invoicePlan;
+ if(recyclingApplication.getUseRecord() != null){
+ Long useId = recyclingApplication.getUseRecord().getId();
+ vo.setUserecordId(useId);
+ }
vo.setOperationRoom(recyclingApplication.getOperationRoom());
}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r26258 -r26611
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 26258)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 26611)
@@ -287,6 +287,7 @@
+
回收人
清点人
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r26610 -r26611
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 26610)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 26611)
@@ -9852,7 +9852,7 @@
Integer washUnqualifiedAmount = nameAndAmount.get(materialName);
JSONObject mdJson = mdsJson.get(materialName);
String type = UNDEFINED_TYPE;
- if(mdsJson != null){
+ if(mdJson != null){
String typeOfJson = mdJson.optString("type");
if(StringUtils.isNotBlank(typeOfJson)){//材料类型未定义的话，设为未设置
type = typeOfJson;
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java
===================================================================
diff -u -r23239 -r26611
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java (.../RecyclingApplicationVo.java) (revision 23239)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java (.../RecyclingApplicationVo.java) (revision 26611)
@@ -58,7 +58,10 @@
* 版本号
*/
private Integer version;
-
+ /**
+ * 使用记录id
+ */
+ private Long userecordId;
public Long getId() {
return id;
}
@@ -226,5 +229,13 @@
public void setVersion(Integer version) {
this.version = version;
}
+
+ public Long getUserecordId() {
+ return userecordId;
+ }
+
+ public void setUserecordId(Long userecordId) {
+ this.userecordId = userecordId;
+ }
}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r26452 -r26611
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 26452)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 26611)
@@ -1275,7 +1275,16 @@
}else{
var ti = msg.tousseInstance;
var td = ti.tousseDefinition;
-
+ if(sstsConfig.restrictAddOtherGoodsToApplicationFromUseRecord && $('#userecordId').val() != ''){
+ var existRow = tousseItemExists(td.id, td.name, td.tousseType);
+ if(existRow == -1){
+ alertDiv("不能添加申请单以外的物品 ");
+ return false;
+ }else if(parseInt($('#applicationAmount'+existRow).val()) - parseInt($('#loadedAmount'+existRow).val()) < 1 ){
+ alertDiv("回收数量不能超过申请数量");
+ return false;
+ }
+ }
var exist = idCardIsExist(barcode);
if(exist){
alertDiv(barcode+",已入筐!");
@@ -2106,9 +2115,15 @@
var showTousseName = $('#showTousseName'+row).val();
var tousseType = $('#tousseType'+row).val();
var isCleanedEntirely = $('#isCleanedEntirely'+row).val();
+ var recycleAmount = parseInt($('#recycleAmount'+row).val(),10);
+ var applicationAmount = parseInt($('#applicationAmount'+row).val(),10);
+ //是否开启限制使用记录转换的申请单不能添加别的物品
+ if(sstsConfig.restrictAddOtherGoodsToApplicationFromUseRecord && $('#userecordId').val() !='' && recycleAmount > applicationAmount){
+ alertDiv("回收数量不能超过申请数量");
+ return false;
+ }
+ var amount = recycleAmount - parseInt($('#loadedAmount'+row).val(),10);
- var amount = parseInt($('#recycleAmount'+row).val(),10) - parseInt($('#loadedAmount'+row).val(),10);
-
//回收数量扣减入筐操作 如果已经入筐就不能入筐，只能是手动从篮筐里面删除，因为程序不晓得从哪个篮筐里面扣减
var msg = "";
if(amount < 0){
@@ -3606,6 +3621,11 @@
alertDiv("外来器械回收单不能添加器械包！");
return false;
}
+ //是否开启限制使用记录转换的申请单不能添加别的物品
+ if(sstsConfig.restrictAddOtherGoodsToApplicationFromUseRecord && $('#userecordId').val() != ''){
+ alertDiv("使用记录转换的申请单不能添加器械包");
+ return false;
+ }
if(!checkSelectDepartBeforeAddTousse()){
return false;
}
@@ -4115,6 +4135,9 @@
if(application == null)
return;
recyclingStatus = application.recyclingStatus;
+ if(application.userecordId != null){
+ $("#userecordId").val(application.userecordId);
+ }
if(application.recyclingRecordId != null && application.type != TYPE_FOREIGNTOUSSEAPPLIACTION){//外来器械申请单二次回收,会有历史回收记录
loadRecyclingRecordById(application.recyclingRecordId);
}else{
Index: ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js
===================================================================
diff -u -r26605 -r26611
--- ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js (.../config.js) (revision 26605)
+++ ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js (.../config.js) (revision 26611)
@@ -215,5 +215,7 @@
//启用加急功能,true显示，false和未定义隐藏
enableUrgentFunction:true,
//是否显示基数管理的桌面图标 true显示,false不显示
- isShowCardinalNumManageDesktopIcon:true
+ isShowCardinalNumManageDesktopIcon:true,
+ //限制使用记录转换的申请单不能添加别的物品
+ restrictAddOtherGoodsToApplicationFromUseRecord : true
}
\ No newline at end of file