|
@@ -202,20 +202,19 @@ public class stockbill extends Controller {
|
|
|
querySQL.setWhere("t1.st_stockbillid",st_stockbillids);
|
|
querySQL.setWhere("t1.st_stockbillid",st_stockbillids);
|
|
|
Rows rows = querySQL.query();
|
|
Rows rows = querySQL.query();
|
|
|
RowsMap rowsMap =rows.toRowsMap("st_stockbillid");
|
|
RowsMap rowsMap =rows.toRowsMap("st_stockbillid");
|
|
|
- RowsMap periodrowsMap =dbConnect.runSqlQuery("select CONCAT(year, '-',LPAD(month, 2, '0')) period from st_period where isclose=1").toRowsMap("period");
|
|
|
|
|
- if(periodrowsMap.containsKey(period)){
|
|
|
|
|
|
|
+ RowsMap periodrowsMap =dbConnect.runSqlQuery("select CONCAT(year, '-',LPAD(month, 2, '0')) period,isclose from st_period").toRowsMap("isclose");
|
|
|
|
|
+
|
|
|
|
|
+ if(periodrowsMap.get("1").toRowsMap("period").containsKey(period)){
|
|
|
return getErrReturnObject().setErrMsg("原单据会计期间已关闭,不可调整").toString();
|
|
return getErrReturnObject().setErrMsg("原单据会计期间已关闭,不可调整").toString();
|
|
|
}
|
|
}
|
|
|
for (Object o : st_stockbillids) {
|
|
for (Object o : st_stockbillids) {
|
|
|
long st_stockbillid = Long.parseLong(o.toString());
|
|
long st_stockbillid = Long.parseLong(o.toString());
|
|
|
if(rowsMap.containsKey(st_stockbillid)){
|
|
if(rowsMap.containsKey(st_stockbillid)){
|
|
|
if(rowsMap.get(st_stockbillid).get(0).getString("status").equals("审核")){
|
|
if(rowsMap.get(st_stockbillid).get(0).getString("status").equals("审核")){
|
|
|
- if (periodrowsMap.containsKey(period)) {
|
|
|
|
|
- if(rowsMap.get(period).toRowsMap("isclose").containsKey("1")){
|
|
|
|
|
- batchDeleteErr.addErr(st_stockbillid, "原单据会计期间已关闭,不可调整");
|
|
|
|
|
- continue;
|
|
|
|
|
- }
|
|
|
|
|
- }else{
|
|
|
|
|
|
|
+ if (periodrowsMap.get("1").toRowsMap("period").containsKey(period)) {
|
|
|
|
|
+ batchDeleteErr.addErr(st_stockbillid, "原单据会计期间已关闭,不可调整");
|
|
|
|
|
+ continue;
|
|
|
|
|
+ }else if(!periodrowsMap.get("0").toRowsMap("period").containsKey(period)){
|
|
|
batchDeleteErr.addErr(st_stockbillid, "原单据会计期间未生成,不可调整");
|
|
batchDeleteErr.addErr(st_stockbillid, "原单据会计期间未生成,不可调整");
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|