src/com/uas/erp/service/fa/impl/CmQueryServiceImpl.java

@@ -1042,7 +1042,7 @@ public class CmQueryServiceImpl implements CmQueryService {
 		boolean showrbmsg = config.getBoolean("showrbmsg"); // 显示收款单信息
 		boolean showgsmsg = config.getBoolean("showgsmsg"); // 显示发出商品信息
 		boolean showprerecmsg = config.getBoolean("showprerecmsg"); // 显示预收信息
-		boolean showdemsg = config.getBoolean("showdemsg"); // 显示销售发票信息
+		//boolean showdemsg = config.getBoolean("showdemsg"); // 显示销售发票信息
 		List<Map<String, Object>> store = new ArrayList<Map<String, Object>>();
 		String sql = "select '' tb_code,'' tb_vouc,'期初余额' tb_kind,'' tb_custcode,'' tb_yearmonth,to_date(CM_YEARMONTH,'yyyymm') tb_date,to_date('','') tb_billdate,cm_currency tb_currency,'' tb_remark,"
 				+ " 0 tb_aramount,0 tb_rbamount,0 tb_aramounts,0 tb_rbamounts,nvl(cm_beginamount,0) tb_balance,1 tb_index,0 tb_id,'custmonth' tb_table,"
@@ -1643,7 +1643,7 @@ public class CmQueryServiceImpl implements CmQueryService {
 		boolean showrbmsg = config.getBoolean("showrbmsg"); // 显示收款单信息
 		boolean showgsmsg = config.getBoolean("showgsmsg"); // 显示发出商品信息
 		boolean showprerecmsg = config.getBoolean("showprerecmsg");
-		boolean showdemsg = config.getBoolean("showdemsg"); // 显示销售发票信息
+		//boolean showdemsg = config.getBoolean("showdemsg"); // 显示销售发票信息
 
 		List<Map<String, Object>> store = new ArrayList<Map<String, Object>>();
 		String sql = " select '' tb_code,'期初余额' tb_kind, '' tb_custcode,0 tb_yearmonth, to_date('','') tb_date,	"
@@ -2084,7 +2084,7 @@ public class CmQueryServiceImpl implements CmQueryService {
 		boolean showrbmsg = config.getBoolean("showrbmsg"); // 显示收款单信息
 		boolean showgsmsg = config.getBoolean("showgsmsg"); // 显示发出商品信息
 		boolean showprerecmsg = config.getBoolean("showprerecmsg");
-		boolean showdemsg = config.getBoolean("showdemsg"); // 显示销售发票信息
+		//boolean showdemsg = config.getBoolean("showdemsg"); // 显示销售发票信息
 
 		List<Map<String, Object>> store = new ArrayList<Map<String, Object>>();
 		String sql = " select '' tb_code,'期初余额' tb_kind,'' tb_vouc, '' tb_custcode,0 tb_yearmonth, to_date(CM_YEARMONTH,'yyyymm') tb_date,	"
@@ -3497,7 +3497,7 @@ public class CmQueryServiceImpl implements CmQueryService {
 		boolean showrbmsg = config.getBoolean("showrbmsg"); // 显示收款单信息
 		boolean showgsmsg = config.getBoolean("showgsmsg"); // 显示发出商品信息
 		boolean showprerecmsg = config.getBoolean("showprerecmsg");
-		boolean showdemsg = config.getBoolean("showdemsg"); // 显示销售发票信息
+		//boolean showdemsg = config.getBoolean("showdemsg"); // 显示销售发票信息
 
 		List<Map<String, Object>> store = new ArrayList<Map<String, Object>>();
 		String sql = "" + "select ''                                   tb_code,				"

src/com/uas/erp/service/fa/impl/PayBalanceServiceImpl.java

@@ -494,6 +494,11 @@ public class PayBalanceServiceImpl implements PayBalanceService {
 		Object[] args = baseDao.getFieldsDataByCondition("PayBalance", "pb_auditstatuscode,pb_date", "pb_id=" + pb_id);
 		StateAssert.submitOnlyEntering(args[0]);
 		checkDate(args[1].toString().substring(0, 10));
+		SqlRowList billcode = baseDao.queryForRowSet("select distinct pbd_ordercode from paybalancedetail where pbd_pbid=? and nvl(pbd_ordercode,' ')<>' '",
+				pb_id);
+		while (billcode.next()) {
+			baseDao.procedure("SP_APLOCKAMOUNT2", new Object[] { billcode.getObject("pbd_ordercode") });
+		}
 		String pb_vendcode = baseDao.getJdbcTemplate().queryForObject(
 				"select wmsys.wm_concat(pb_vendcode) from PayBalance left join category on ca_code=pb_catecode "
 						+ "left join vendor on ve_code=pb_vendcode "
@@ -625,6 +630,9 @@ public class PayBalanceServiceImpl implements PayBalanceService {
 		baseDao.submit("PayBalance", "pb_id=" + pb_id, "pb_auditstatus", "pb_auditstatuscode");
 		// 记录操作
 		baseDao.logger.submit(caller, "pb_id", pb_id);
+		while (billcode.next()) {
+			baseDao.procedure("SP_APLOCKAMOUNT2", new Object[] { billcode.getObject("pbd_ordercode") });
+		}
 		// 执行提交后的其它逻辑
 		handlerService.afterSubmit(caller, pb_id);
 	}
@@ -641,6 +649,11 @@ public class PayBalanceServiceImpl implements PayBalanceService {
 				+ "'", "pb_id=" + pb_id);
 		// 记录操作
 		baseDao.logger.resSubmit(caller, "pb_id", pb_id);
+		SqlRowList billcode = baseDao.queryForRowSet("select distinct pbd_ordercode from paybalancedetail where pbd_pbid=? and nvl(pbd_ordercode,' ')<>' '",
+				pb_id);
+		while (billcode.next()) {
+			baseDao.procedure("SP_APLOCKAMOUNT2", new Object[] { billcode.getObject("pbd_ordercode") });
+		}
 		handlerService.afterResSubmit(caller, pb_id);
 	}
 
@@ -901,7 +914,7 @@ public class PayBalanceServiceImpl implements PayBalanceService {
 			}
 		}
 		// 重新计算明细行发票的锁定金额
-		billcode = baseDao.queryForRowSet("select pbd_ordercode from paybalancedetail where pbd_pbid=? and nvl(pbd_ordercode,' ')<>' '",
+		billcode = baseDao.queryForRowSet("select distinct pbd_ordercode from paybalancedetail where pbd_pbid=? and nvl(pbd_ordercode,' ')<>' '",
 				pb_id);
 		while (billcode.next()) {
 			baseDao.procedure("SP_APLOCKAMOUNT2", new Object[] { billcode.getObject("pbd_ordercode") });