1.物资耗材系统-采购退货-物资退货制单:已审核单据增加取消完成限制

2.药事系统-退货-退货制单:已审核单据增加取消完成限制
develop/lyx_20250117_hcth
lxx 6 days ago
parent 45dccf6f89
commit 2ac9b2ae8b
  1. 11
      WEB-INF/src/com/his/yfyk/service/YptkService.java
  2. 9
      WEB-INF/src/com/mms/service/MMStkService.java

@ -2,14 +2,11 @@ package com.his.yfyk.service;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import com.his.yfyk.model.YptkModel;
import com.util.MainLog;
import com.util.MainUtil;
import com.util.SnowIdUtils;
import com.wat.core.config.DaoCreator;
@ -285,6 +282,7 @@ public class YptkService {
String jgid=histhddao.getColumnValueAsString("JGID");
String dptid=histhddao.getColumnValueAsString("DPTID");
String djh=histhddao.getColumnValueAsString("DJH");
String SHZT=histhddao.getColumnValueAsString("SHZT");
if(lbwc){
for(int i=histhdmxdao.getRowCount()-1;i>=0;i--){
String rkpkey=histhdmxdao.getColumnValueAsString(i,"RKDMX_PKEY");
@ -389,6 +387,13 @@ public class YptkService {
}
if(histhddao.getRowCount()>0) lb=true;
}else{
if ("1".equals(SHZT)){
model.setResult(-1);
model.setMessage("错误:已审核状态,不可取消完成!");
return model;
}
lb=true;
for(int i=0;i<histhdmxdao.getRowCount();i++){
String sfxbm=histhdmxdao.getColumnValueAsString(i,"SFX_BM");

@ -6,7 +6,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import com.mms.model.MMStkModel;
import com.util.MainUtil;
import com.util.SnowIdUtils;
@ -273,6 +272,7 @@ public class MMStkService {
String jgid=mmsthddao.getColumnValueAsString("JGID");
String dptid=mmsthddao.getColumnValueAsString("DPTID");
String djh=mmsthddao.getColumnValueAsString("DJH");
String SHZT=mmsthddao.getColumnValueAsString("SHZT");
if(lbwc){
for(int i=mmsthdmxdao.getRowCount()-1;i>=0;i--){
String rkpkey=mmsthdmxdao.getColumnValueAsString(i,"RKDMX_PKEY");
@ -369,6 +369,13 @@ public class MMStkService {
}
if(mmsthddao.getRowCount()>0) lb=true;
}else{
if ("1".equals(SHZT)){
model.setResult(-1);
model.setMessage("错误:已审核状态,不可取消完成!");
return model;
}
lb=true;
for(int i=0;i<mmsthdmxdao.getRowCount();i++){
String sfxbm=mmsthdmxdao.getColumnValueAsString(i,"SFX_BM");

Loading…
Cancel
Save