yonyou
/
tkjt
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
lihao 2024-12-25 14:44:13 +08:00
parent 1d2da891fe 577666687f
commit d90f67993f
3 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ic/src/client/nccloud/web/ic/outbound/sapplybill/action/QueryPickmFor4455Action.java
View File

@ -61,19 +61,13 @@ public class QueryPickmFor4455Action implements ICommonAction {
return null;
}
// VO与UI数据格式转换 卡片列表：BillGridOperator
BillGrid[] grids = new BillGrid[0];
try {
BillGridOperator operator = new BillGridOperator(info.getTempletid(), info.getPageCode());
grids = operator.toBillGrids(vos);
if (grids != null) {
StoreReqScaleUtil util = new StoreReqScaleUtil();
for (BillGrid billGrid : grids) {
util.processGrid(billGrid, false);
}
BillGridOperator operator = new BillGridOperator(info.getTempletid(), info.getPageCode());
BillGrid[] grids = operator.toBillGrids(vos);
if (grids != null) {
StoreReqScaleUtil util = new StoreReqScaleUtil();
for (BillGrid billGrid : grids) {
util.processGrid(billGrid, false);
}
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e);
}
return grids;
}

2
pu/src/private/nc/bs/pu/m422x/query/Abstract422XRefQueryBP1.java
View File

@ -44,7 +44,7 @@ public abstract class Abstract422XRefQueryBP1 {
public PickmReqAppVO[] queryPickmReqVOs() {
SCMDataAccessUtils utils = new SCMDataAccessUtils(10000);
this.psor.appendCurrentGroup();
// this.psor.appendCurrentGroup();
StringBuilder sql = this.makeGetPKSql();
String[][] pks = utils.query(sql.toString()).toTwoDimensionStringArray();
if (null != pks && pks.length != 0) {

30
pu/src/private/nc/bs/pu/m422x/query/QueryFor4455BP1.java
View File

@ -7,10 +7,10 @@ package nc.bs.pu.m422x.query;
import nc.bs.pu.m422x.plugin.StoreReqAppPluginPoint;
import nc.bs.pu.m422x.query.rule.CanOutreqNumCalcRule;
import nc.impl.pubapp.pattern.rule.IFilterRule;
import nc.impl.pubapp.pattern.rule.processer.AroundProcesser;
import nc.ui.querytemplate.querytree.IQueryScheme;
import nc.vo.pu.m422x.entity.PickmReqAppVO;
import nc.vo.pu.m422x.entity.StoreReqAppVO;
import nccloud.baseapp.core.log.NCCForUAPLogger;
import nccloud.commons.lang.ArrayUtils;
public class QueryFor4455BP1 extends Abstract422XRefQueryBP1 {
@ -18,28 +18,32 @@ public class QueryFor4455BP1 extends Abstract422XRefQueryBP1 {
super(queryScheme);
}
private void addRule(AroundProcesser<PickmReqAppVO> processer) {
processer.addAfterRule((IFilterRule<PickmReqAppVO>) new CanOutreqNumCalcRule());
private void addRule(AroundProcesser<StoreReqAppVO> processer) {
processer.addAfterRule(new CanOutreqNumCalcRule());
}
public StringBuilder makeGetPKSql() {
StringBuilder wholeSql = new StringBuilder();
wholeSql.append(" SELECT DISTINCT a.cpickmid,b.cpickm_bid" +
" FROM" +
" mm_pickm a" +
" INNER JOIN mm_pickm_b b ON b.cpickmid = a.cpickmid" +
" WHERE" +
" a.dr = 0 AND b.dr = 0 and a.APPROVERTIME > '2024-10-01'");
wholeSql.append(" SELECT DISTINCT a.cpickmid,b.cpickm_bid");
wholeSql.append(" FROM");
wholeSql.append(" (");
wholeSql.append(" SELECT cpickmid");
wholeSql.append(this.psor.getFinalFromWhere());
wholeSql.append(" AND APPROVERTIME > '2024-10-01'");
NCCForUAPLogger.debug("finalFromWhere = " + this.psor.getFinalFromWhere());
wholeSql.append(" ) a");
wholeSql.append(" INNER JOIN mm_pickm_b b ON b.cpickmid = a.cpickmid AND b.dr = 0");
NCCForUAPLogger.debug("wholeSql = " + wholeSql);
return wholeSql;
}
protected PickmReqAppVO[] processQueryResult(PickmReqAppVO[] queryResult) {
protected StoreReqAppVO[] processQueryResult(StoreReqAppVO[] queryResult) {
if (ArrayUtils.isEmpty(queryResult)) {
return null;
} else {
AroundProcesser<PickmReqAppVO> processer = new AroundProcesser(StoreReqAppPluginPoint.PULL_4455);
AroundProcesser<StoreReqAppVO> processer = new AroundProcesser(StoreReqAppPluginPoint.PULL_4455);
this.addRule(processer);
return (PickmReqAppVO[]) processer.after(queryResult);
return (StoreReqAppVO[]) processer.after(queryResult);
}
}
}