|
|
@@ -57,9 +57,10 @@ public class ProdIOServiceImpl implements ProdIOService{
|
|
|
logger.info("获取单据字段...");
|
|
|
List<Object> mainFields = baseDao.getFieldDatasByCondition("form left join formdetail on fo_id=fd_foid", "fd_field",
|
|
|
"fo_caller='" + caller + "' and (upper(fd_field) like upper('pi_%') or upper(fd_field) like upper('prodinout%pi_%') ) order by fd_detno");
|
|
|
- List<Object> detailFileds = baseDao.getFieldDatasByCondition("detailgrid", "dg_field", "dg_caller='"+ caller +"' and " +
|
|
|
- "(upper(dg_field) like upper('pd_%') or upper(dg_field) like upper('prodiodetail.%pd_%')) and UPPER(dg_field) not in (select COLUMN_NAME from USER_TAB_COLS where table_name='PURCHASEDETAIL') order by DG_SEQUENCE");
|
|
|
- if (mainFields != null && detailFileds != null) {
|
|
|
+ List<Object> detailFileds = baseDao.getFieldDatasByCondition("detailgrid", "dg_field", "dg_caller='"+ caller +"' and (upper(dg_field) like upper('pd_%') or upper(dg_field) like upper('prodiodetail.%pd_%')) and " +
|
|
|
+ "(UPPER(dg_field) not in (select COLUMN_NAME from USER_TAB_COLS where table_name='PURCHASEDETAIL') or UPPER(dg_field) in " +
|
|
|
+ "(select COLUMN_NAME from USER_TAB_COLS where table_name='PRODIODETAIL' and COLUMN_NAME in( select COLUMN_NAME from USER_TAB_COLS where table_name='PURCHASEDETAIL')) ) order by DG_SEQUENCE");
|
|
|
+ if (mainFields != null && detailFileds != null) {
|
|
|
String mainStr = List2Str(mainFields);
|
|
|
String gridStr = List2Str(detailFileds);
|
|
|
List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
|