root/yongYuJiaJu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
ldj_willow
2022-10-31 16:03:56 +08:00
parent dafff303c9
commit e410d628de
13 changed files with 73 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/WQLFun.java
View File

@@ -1128,7 +1128,7 @@ public class WQLFun {
sContent = StringUtils.replace(sContent,"< =" ,"<=" ); sContent = StringUtils.replace(sContent,"< =" ,"<=" );
sContent = updateTrans(sContent, dbType); sContent = updateTrans(sContent, dbType);
sContent = deleteTrans(sContent, dbType); sContent = deleteTrans(sContent, dbType);
// if ((dbType == 1) && (sContent.toUpperCase().indexOf("ROW_NUMBER")>0)){ // if ((dbType == 1) && (sContent.toUpperCase().indexOf("col_numBER")>0)){
// sContent = rowNumberTrans(sContent, dbType); // sContent = rowNumberTrans(sContent, dbType);
// } // }
//处理APP函数 //处理APP函数
@@ -2104,9 +2104,9 @@ public class WQLFun {
switch(dbType){ switch(dbType){
case 1: case 1:
/*截取rownumber子句*/ /*截取rownumber子句*/
int point = sql.toUpperCase().indexOf("ROW_NUMBER"); int point = sql.toUpperCase().indexOf("col_numBER");
String aft = sql.substring(sql.toUpperCase().indexOf("ROW_NUMBER")+10); String aft = sql.substring(sql.toUpperCase().indexOf("col_numBER")+10);
String rn = "ROW_NUMBER"; String rn = "col_numBER";
char[] temp = aft.toCharArray(); char[] temp = aft.toCharArray();
int flag = 0; int flag = 0;
int num = 0; int num = 0;
@@ -2168,7 +2168,7 @@ public class WQLFun {
} }
/*将后一段整理后，如果后一段中依然存在rownumber，则递归调用本函数。*/ /*将后一段整理后，如果后一段中依然存在rownumber，则递归调用本函数。*/
if (aft.indexOf("ROW_NUMBER")>0) return rowNumberTrans(aft, dbType); if (aft.indexOf("col_numBER")>0) return rowNumberTrans(aft, dbType);
return pre + rn + aft; return pre + rn + aft;
case 2: case 2:
return sql; return sql;
@@ -2335,12 +2335,12 @@ public class WQLFun {
//System.out.println(deleteTrans(delete, 1)); //System.out.println(deleteTrans(delete, 1));
//System.out.println(APPROUND("0.99999990", "3")); //System.out.println(APPROUND("0.99999990", "3"));
//String sql = "SELECT B.DYNAMICINFOLID , B.TITLE , B.AUDITDATE , B.AUTHORNAME , B.AUTHORDEPTNAME , B.ATTACHSID , B.KEYWORD , B.YISSUE FROM ( SELECT ROW_NUMBER ( ) OVER ( ORDER BY A.AUDITDATE DESC , A.DYNAMICINFOLID DESC ) AS LINENUM , A.DYNAMICINFOLID AS DYNAMICINFOLID , A.TITLE AS TITLE , A.AUDITDATE AS AUDITDATE , A.AUTHORNAME AS AUTHORNAME , A.AUTHORDEPTNAME AS AUTHORDEPTNAME , A.ATTACHSID AS ATTACHSID , A.KEYWORD AS KEYWORD , A.DYNAMICINFOYEAR + '年第' + A.YEARISSUE + '期（总第' + A.ISSUE + '期）' AS YISSUE FROM dbo.G_CM_DynamicInfo AS A WHERE A.STATUS = '8' AND ( ? = '0' OR A.CORPTYPE = ? ) AND A.RECORDFLAG = ? ORDER BY A.AUDITDATE DESC , A.DYNAMICINFOLID DESC ) AS B WHERE B.LINENUM <= 10 "; //String sql = "SELECT B.DYNAMICINFOLID , B.TITLE , B.AUDITDATE , B.AUTHORNAME , B.AUTHORDEPTNAME , B.ATTACHSID , B.KEYWORD , B.YISSUE FROM ( SELECT col_numBER ( ) OVER ( ORDER BY A.AUDITDATE DESC , A.DYNAMICINFOLID DESC ) AS LINENUM , A.DYNAMICINFOLID AS DYNAMICINFOLID , A.TITLE AS TITLE , A.AUDITDATE AS AUDITDATE , A.AUTHORNAME AS AUTHORNAME , A.AUTHORDEPTNAME AS AUTHORDEPTNAME , A.ATTACHSID AS ATTACHSID , A.KEYWORD AS KEYWORD , A.DYNAMICINFOYEAR + '年第' + A.YEARISSUE + '期（总第' + A.ISSUE + '期）' AS YISSUE FROM dbo.G_CM_DynamicInfo AS A WHERE A.STATUS = '8' AND ( ? = '0' OR A.CORPTYPE = ? ) AND A.RECORDFLAG = ? ORDER BY A.AUDITDATE DESC , A.DYNAMICINFOLID DESC ) AS B WHERE B.LINENUM <= 10 ";
//String sql = "SELECT ROW_NUMBER ( ) OVER ( ORDER BY A.AUDITDATE DESC , A.DYNAMICINFOLID DESC )"; //String sql = "SELECT col_numBER ( ) OVER ( ORDER BY A.AUDITDATE DESC , A.DYNAMICINFOLID DESC )";
//String sql = "SELECT ROW_NUMBER ( ) OVER ( ORDER BY A.AUDITDATE DESC , A.DYNAMICINFOLID DESC ) FROM A ORDER BY ABC"; //String sql = "SELECT col_numBER ( ) OVER ( ORDER BY A.AUDITDATE DESC , A.DYNAMICINFOLID DESC ) FROM A ORDER BY ABC";
//String sql = "INSERT INTO dbo.T_TX_FIN101004 ( dbo.T_TX_FIN101004.SEQNO , dbo.T_TX_FIN101004.PRODUCTID , dbo.T_TX_FIN101004.BILLTYPEID , dbo.T_TX_FIN101004.FINANCEBILLNO , dbo.T_TX_FIN101004.FINANCEDATE , dbo.T_TX_FIN101004.BRIEFNAME , dbo.T_TX_FIN101004.QUANTITY , dbo.T_TX_FIN101004.NOTAXAMOUNT , dbo.T_TX_FIN101004.AMOUNT , dbo.T_TX_FIN101004.COSTAMOUNT , dbo.T_TX_FIN101004.RESTQUANTITY , dbo.T_TX_FIN101004.RESTAMOUNT ) SELECT ROW_NUMBER ( ) OVER ( ORDER BY A.PRODUCTID , A.FINANCEDATE , A.BILLTYPEID ) , A.PRODUCTID , A.BILLTYPEID , A.FINANCEBILLNO , A.FINANCEDATE , A.BRIEFNAME , A.QUANTITY , A.NOTAXAMOUNT , A.AMOUNT , A.COSTAMOUNT , A.RESTQUANTITY , A.RESTAMOUNT FROM dbo.B_FI_FinanceAccount AS A WHERE A.STORSID = ? AND A.BIZMONTH = ? AND A.CORPSID = ? ORDER BY A.PRODUCTID , A.FINANCEDATE , A.BILLTYPEID "; //String sql = "INSERT INTO dbo.T_TX_FIN101004 ( dbo.T_TX_FIN101004.SEQNO , dbo.T_TX_FIN101004.PRODUCTID , dbo.T_TX_FIN101004.BILLTYPEID , dbo.T_TX_FIN101004.FINANCEBILLNO , dbo.T_TX_FIN101004.FINANCEDATE , dbo.T_TX_FIN101004.BRIEFNAME , dbo.T_TX_FIN101004.QUANTITY , dbo.T_TX_FIN101004.NOTAXAMOUNT , dbo.T_TX_FIN101004.AMOUNT , dbo.T_TX_FIN101004.COSTAMOUNT , dbo.T_TX_FIN101004.RESTQUANTITY , dbo.T_TX_FIN101004.RESTAMOUNT ) SELECT col_numBER ( ) OVER ( ORDER BY A.PRODUCTID , A.FINANCEDATE , A.BILLTYPEID ) , A.PRODUCTID , A.BILLTYPEID , A.FINANCEBILLNO , A.FINANCEDATE , A.BRIEFNAME , A.QUANTITY , A.NOTAXAMOUNT , A.AMOUNT , A.COSTAMOUNT , A.RESTQUANTITY , A.RESTAMOUNT FROM dbo.B_FI_FinanceAccount AS A WHERE A.STORSID = ? AND A.BIZMONTH = ? AND A.CORPSID = ? ORDER BY A.PRODUCTID , A.FINANCEDATE , A.BILLTYPEID ";
//String sql = "select * from (select PAGE_SRCRESULTSET_1.*, row_number() over(order by sectmovesid) as SORT_INDEXFIELDALIAS from ( SELECT A.SECTMOVESID AS SECTMOVESID , E.CORPSID AS CORPSID , E.BUSINESSCORPNAME AS SIMPLENAME , D.STORSID AS STORSID , D.STORNAME AS STORNAME , C.SECTSID AS OUTSECTSID , C.SECTNAME AS OUTSECTNAME , B.SECTSID AS INSECTSID , B.SECTNAME AS INSECTNAME , ( CASE WHEN ? = '1' THEN A.TOTALDEFQTY / 250 WHEN ? = '2' THEN A.TOTALDEFQTY / 50 WHEN ? = '3' THEN A.TOTALDEFQTY WHEN ? = '4' THEN A.TOTALDEFQTY * 10 WHEN ? = '5' THEN A.TOTALDEFQTY * 200 ELSE A.TOTALDEFQTY END ) AS TOTALDEFQTY , A.DETAILCOUNT AS DETAILCOUNT , A.MOVEOUTCOUNT AS MOVEOUTCOUNT , F.PERSONSID AS OPERPERSONSID , F.PERSONNAME AS OPERPERSONNAME , A.CREATEDATE AS CREATEDATE , G.PERSONSID AS OUTCFMPERSONSID , G.PERSONNAME AS OUTCFMPERSONNAME , A.MOVEOUTDATE AS MOVEOUTDATE , H.PERSONSID AS INCFMPERSONSID , H.PERSONNAME AS INCFMPERSONNAME , A.MOVEINDATE AS MOVEINDATE , A.REMARK AS REMARK , A.STATUS AS STATUS , ( CASE WHEN A.STATUS = '01' THEN '待移出分配' WHEN A.STATUS = '02' THEN '移出分配中' WHEN A.STATUS = '03' THEN '待移出确认' WHEN A.STATUS = '04' THEN '待移入分配' WHEN A.STATUS = '05' THEN '移入分配中' WHEN A.STATUS = '06' THEN '待移入确认' ELSE '移入确认完毕' END ) AS STATUSNAME FROM dbo.B_ST_BZSectMoveMst AS A LEFT OUTER JOIN dbo.B_ST_BSSectAttr AS B ON A.MOVEINSECTSID = B.SECTSID LEFT OUTER JOIN dbo.B_ST_BSSectAttr AS C ON A.MOVEOUTSECTSID = C.SECTSID LEFT OUTER JOIN dbo.B_ST_BSRealStorAttr AS D ON A.STORSID = D.STORSID LEFT OUTER JOIN dbo.G_OG_CorpInfo AS E ON A.CORPSID = E.CORPSID LEFT OUTER JOIN dbo.G_OG_PersonInfo AS F ON A.CREATERSID = F.PERSONSID LEFT OUTER JOIN dbo.G_OG_PersonInfo AS G ON A.MVOUTAUDITORSID = G.PERSONSID LEFT OUTER JOIN dbo.G_OG_PersonInfo AS H ON A.MVINAUDITORSID = H.PERSONSID WHERE 1 = 1 AND A.CREATEDATE >= '20070518' AND A.CREATEDATE <= '20070518' AND A.STORSID = '001000001' AND A.ISACTIVE = '1' ORDER BY A.CREATEDATE DESC ) PAGE_SRCRESULTSET_1 ) PAGE_SRCRESULTSET_2 where PAGE_SRCRESULTSET_2.SORT_INDEXFIELDALIAS <= 50 and PAGE_SRCRESULTSET_2.SORT_INDEXFIELDALIAS > 0"; //String sql = "select * from (select PAGE_SRCRESULTSET_1.*, col_number() over(order by sectmovesid) as SORT_INDEXFIELDALIAS from ( SELECT A.SECTMOVESID AS SECTMOVESID , E.CORPSID AS CORPSID , E.BUSINESSCORPNAME AS SIMPLENAME , D.STORSID AS STORSID , D.STORNAME AS STORNAME , C.SECTSID AS OUTSECTSID , C.SECTNAME AS OUTSECTNAME , B.SECTSID AS INSECTSID , B.SECTNAME AS INSECTNAME , ( CASE WHEN ? = '1' THEN A.TOTALDEFQTY / 250 WHEN ? = '2' THEN A.TOTALDEFQTY / 50 WHEN ? = '3' THEN A.TOTALDEFQTY WHEN ? = '4' THEN A.TOTALDEFQTY * 10 WHEN ? = '5' THEN A.TOTALDEFQTY * 200 ELSE A.TOTALDEFQTY END ) AS TOTALDEFQTY , A.DETAILCOUNT AS DETAILCOUNT , A.MOVEOUTCOUNT AS MOVEOUTCOUNT , F.PERSONSID AS OPERPERSONSID , F.PERSONNAME AS OPERPERSONNAME , A.CREATEDATE AS CREATEDATE , G.PERSONSID AS OUTCFMPERSONSID , G.PERSONNAME AS OUTCFMPERSONNAME , A.MOVEOUTDATE AS MOVEOUTDATE , H.PERSONSID AS INCFMPERSONSID , H.PERSONNAME AS INCFMPERSONNAME , A.MOVEINDATE AS MOVEINDATE , A.REMARK AS REMARK , A.STATUS AS STATUS , ( CASE WHEN A.STATUS = '01' THEN '待移出分配' WHEN A.STATUS = '02' THEN '移出分配中' WHEN A.STATUS = '03' THEN '待移出确认' WHEN A.STATUS = '04' THEN '待移入分配' WHEN A.STATUS = '05' THEN '移入分配中' WHEN A.STATUS = '06' THEN '待移入确认' ELSE '移入确认完毕' END ) AS STATUSNAME FROM dbo.B_ST_BZSectMoveMst AS A LEFT OUTER JOIN dbo.B_ST_BSSectAttr AS B ON A.MOVEINSECTSID = B.SECTSID LEFT OUTER JOIN dbo.B_ST_BSSectAttr AS C ON A.MOVEOUTSECTSID = C.SECTSID LEFT OUTER JOIN dbo.B_ST_BSRealStorAttr AS D ON A.STORSID = D.STORSID LEFT OUTER JOIN dbo.G_OG_CorpInfo AS E ON A.CORPSID = E.CORPSID LEFT OUTER JOIN dbo.G_OG_PersonInfo AS F ON A.CREATERSID = F.PERSONSID LEFT OUTER JOIN dbo.G_OG_PersonInfo AS G ON A.MVOUTAUDITORSID = G.PERSONSID LEFT OUTER JOIN dbo.G_OG_PersonInfo AS H ON A.MVINAUDITORSID = H.PERSONSID WHERE 1 = 1 AND A.CREATEDATE >= '20070518' AND A.CREATEDATE <= '20070518' AND A.STORSID = '001000001' AND A.ISACTIVE = '1' ORDER BY A.CREATEDATE DESC ) PAGE_SRCRESULTSET_1 ) PAGE_SRCRESULTSET_2 where PAGE_SRCRESULTSET_2.SORT_INDEXFIELDALIAS <= 50 and PAGE_SRCRESULTSET_2.SORT_INDEXFIELDALIAS > 0";
//String sql = " SELECT B.DYNAMICINFOLID , B.TITLE , B.AUDITDATE , B.AUTHORNAME , B.AUTHORDEPTNAME , B.ATTACHSID , B.KEYWORD , B.YISSUE FROM ( SELECT A.DYNAMICINFOLID AS DYNAMICINFOLID , A.TITLE AS TITLE , A.AUDITDATE AS AUDITDATE , A.AUTHORNAME AS AUTHORNAME , A.AUTHORDEPTNAME AS AUTHORDEPTNAME , A.ATTACHSID AS ATTACHSID , A.KEYWORD AS KEYWORD , A.DYNAMICINFOYEAR || '年第' || A.YEARISSUE || '期（总第' || A.ISSUE || '期）' AS YISSUE , ROW_NUMBER ( ) OVER ( ORDER BY A.AUDITDATE DESC , A.DYNAMICINFOLID DESC ) AS ROWN FROM TC.G_CM_DynamicInfo AS A WHERE A.STATUS = '8' AND ( ? = '0' OR A.CORPTYPE = '0' OR A.CORPTYPE = ? ) AND A.RECORDFLAG = ? ) AS B WHERE B.ROWN <= 10 ORDER BY B.AUDITDATE DESC , B.DYNAMICINFOLID DESC "; //String sql = " SELECT B.DYNAMICINFOLID , B.TITLE , B.AUDITDATE , B.AUTHORNAME , B.AUTHORDEPTNAME , B.ATTACHSID , B.KEYWORD , B.YISSUE FROM ( SELECT A.DYNAMICINFOLID AS DYNAMICINFOLID , A.TITLE AS TITLE , A.AUDITDATE AS AUDITDATE , A.AUTHORNAME AS AUTHORNAME , A.AUTHORDEPTNAME AS AUTHORDEPTNAME , A.ATTACHSID AS ATTACHSID , A.KEYWORD AS KEYWORD , A.DYNAMICINFOYEAR || '年第' || A.YEARISSUE || '期（总第' || A.ISSUE || '期）' AS YISSUE , col_numBER ( ) OVER ( ORDER BY A.AUDITDATE DESC , A.DYNAMICINFOLID DESC ) AS ROWN FROM TC.G_CM_DynamicInfo AS A WHERE A.STATUS = '8' AND ( ? = '0' OR A.CORPTYPE = '0' OR A.CORPTYPE = ? ) AND A.RECORDFLAG = ? ) AS B WHERE B.ROWN <= 10 ORDER BY B.AUDITDATE DESC , B.DYNAMICINFOLID DESC ";
//System.out.println(rowNumberTrans(sql.toUpperCase(), 1)); //System.out.println(rowNumberTrans(sql.toUpperCase(), 1));
//String sSQL = BF.ScriptSwitch("INSERT INTO #T_QU_BS201011_1 ( #T_QU_BS201011_1.INVID , #T_QU_BS201011_1.OLDTYPECODE , #T_QU_BS201011_1.OLDTYPENAME , #T_QU_BS201011_1.TYPECODE , #T_QU_BS201011_1.TYPENAME , #T_QU_BS201011_1.CORPNAME , #T_QU_BS201011_1.STORNAME , #T_QU_BS201011_1.TOTALDEFQTY , #T_QU_BS201011_1.DETAILCOUNT , #T_QU_BS201011_1.PERSONNAME , #T_QU_BS201011_1.INPUTTIME , #T_QU_BS201011_1.REMARK , #T_QU_BS201011_1.SOURCENAME ) SELECT A.SUMRETURNINVSID AS INVID , E.BIZINVTYPE AS OLDTYPECODE , E.TYPENAME AS OLDTYPENAME , E.BIZINVTYPE AS TYPECODE , E.TYPENAME , B.SIMPLENAME AS CORPNAME , C.STORNAME , CASE WHEN CAST ( ? as VARCHAR ( 5 ) ) = '1' THEN A.TOTALDEFQTY / 250 WHEN CAST ( ? as VARCHAR ( 5 ) ) = '2' THEN A.TOTALDEFQTY / 50 WHEN CAST ( ? as VARCHAR ( 5 ) ) = '3' THEN A.TOTALDEFQTY WHEN CAST ( ? as VARCHAR ( 5 ) ) = '4' THEN A.TOTALDEFQTY * 10 WHEN CAST ( ? as VARCHAR ( 5 ) ) = '5' THEN A.TOTALDEFQTY * 200 ELSE A.TOTALDEFQTY END AS TOTALDEFQTY , A.DETAILCOUNT , D.PERSONNAME , A.CREATEDATE AS INPUTTIME , A.REMARK , F.DEPARTNAME AS SOURCENAME FROM dbo.B_SH_BZSumCGDInvMst AS A INNER JOIN dbo.G_OG_CorpInfo AS B ON A.CORPSID = B.CORPSID INNER JOIN dbo.B_ST_BSRealStorAttr AS C ON A.REALSTORSID = C.STORSID INNER JOIN dbo.G_OG_PersonInfo AS D ON D.PERSONSID = A.CREATERSID INNER JOIN dbo.G_PB_BizInvType AS E ON E.BIZINVTYPE = '23' LEFT OUTER JOIN dbo.G_OG_DepartInfo AS F ON A.DLVDEPARTSID = F.DEPARTSID WHERE A.ISACTIVE = '1' AND A.STATUS = '01' AND A.CREATEDATE >= CAST ( ? as VARCHAR ( 8 ) ) AND A.CREATEDATE <= CAST ( ? as VARCHAR ( 8 ) ) AND A.CORPSID = ( CASE WHEN CAST ( ? as VARCHAR ( 9 ) ) = '' OR CAST ( ? as VARCHAR ( 9 ) ) IS null THEN A.CORPSID ELSE CAST ( ? as VARCHAR ( 9 ) ) END ) AND A.REALSTORSID = ( CASE WHEN CAST ( ? as VARCHAR ( 9 ) ) = '' OR CAST ( ? as VARCHAR ( 9 ) ) IS null THEN A.REALSTORSID ELSE CAST ( ? as VARCHAR ( 9 ) ) END ) AND E.ISINSTOR = ( CASE WHEN CAST ( ? as VARCHAR ( 1 ) ) = '1' THEN '1' ELSE E.ISINSTOR END ) AND E.ISOUTSTOR = ( CASE WHEN CAST ( ? as VARCHAR ( 1 ) ) = '2' THEN '1' ELSE E.ISOUTSTOR END ) ",1); //String sSQL = BF.ScriptSwitch("INSERT INTO #T_QU_BS201011_1 ( #T_QU_BS201011_1.INVID , #T_QU_BS201011_1.OLDTYPECODE , #T_QU_BS201011_1.OLDTYPENAME , #T_QU_BS201011_1.TYPECODE , #T_QU_BS201011_1.TYPENAME , #T_QU_BS201011_1.CORPNAME , #T_QU_BS201011_1.STORNAME , #T_QU_BS201011_1.TOTALDEFQTY , #T_QU_BS201011_1.DETAILCOUNT , #T_QU_BS201011_1.PERSONNAME , #T_QU_BS201011_1.INPUTTIME , #T_QU_BS201011_1.REMARK , #T_QU_BS201011_1.SOURCENAME ) SELECT A.SUMRETURNINVSID AS INVID , E.BIZINVTYPE AS OLDTYPECODE , E.TYPENAME AS OLDTYPENAME , E.BIZINVTYPE AS TYPECODE , E.TYPENAME , B.SIMPLENAME AS CORPNAME , C.STORNAME , CASE WHEN CAST ( ? as VARCHAR ( 5 ) ) = '1' THEN A.TOTALDEFQTY / 250 WHEN CAST ( ? as VARCHAR ( 5 ) ) = '2' THEN A.TOTALDEFQTY / 50 WHEN CAST ( ? as VARCHAR ( 5 ) ) = '3' THEN A.TOTALDEFQTY WHEN CAST ( ? as VARCHAR ( 5 ) ) = '4' THEN A.TOTALDEFQTY * 10 WHEN CAST ( ? as VARCHAR ( 5 ) ) = '5' THEN A.TOTALDEFQTY * 200 ELSE A.TOTALDEFQTY END AS TOTALDEFQTY , A.DETAILCOUNT , D.PERSONNAME , A.CREATEDATE AS INPUTTIME , A.REMARK , F.DEPARTNAME AS SOURCENAME FROM dbo.B_SH_BZSumCGDInvMst AS A INNER JOIN dbo.G_OG_CorpInfo AS B ON A.CORPSID = B.CORPSID INNER JOIN dbo.B_ST_BSRealStorAttr AS C ON A.REALSTORSID = C.STORSID INNER JOIN dbo.G_OG_PersonInfo AS D ON D.PERSONSID = A.CREATERSID INNER JOIN dbo.G_PB_BizInvType AS E ON E.BIZINVTYPE = '23' LEFT OUTER JOIN dbo.G_OG_DepartInfo AS F ON A.DLVDEPARTSID = F.DEPARTSID WHERE A.ISACTIVE = '1' AND A.STATUS = '01' AND A.CREATEDATE >= CAST ( ? as VARCHAR ( 8 ) ) AND A.CREATEDATE <= CAST ( ? as VARCHAR ( 8 ) ) AND A.CORPSID = ( CASE WHEN CAST ( ? as VARCHAR ( 9 ) ) = '' OR CAST ( ? as VARCHAR ( 9 ) ) IS null THEN A.CORPSID ELSE CAST ( ? as VARCHAR ( 9 ) ) END ) AND A.REALSTORSID = ( CASE WHEN CAST ( ? as VARCHAR ( 9 ) ) = '' OR CAST ( ? as VARCHAR ( 9 ) ) IS null THEN A.REALSTORSID ELSE CAST ( ? as VARCHAR ( 9 ) ) END ) AND E.ISINSTOR = ( CASE WHEN CAST ( ? as VARCHAR ( 1 ) ) = '1' THEN '1' ELSE E.ISINSTOR END ) AND E.ISOUTSTOR = ( CASE WHEN CAST ( ? as VARCHAR ( 1 ) ) = '2' THEN '1' ELSE E.ISOUTSTOR END ) ",1);
//ArrayList tempTableList = new ArrayList(); //ArrayList tempTableList = new ArrayList();

10
lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlSELECT.java
View File

@@ -161,10 +161,10 @@ public class wqlSELECT extends IWQL {
// String sqlTmp = wo.wp.sSQL+" order by " + wo.wp.SORT_ORDERBYFIELD + " limit "+wo.wp.PAGE_PAGESTART+","+wo.wp.PAGE_PAGERECORDNUM; // String sqlTmp = wo.wp.sSQL+" order by " + wo.wp.SORT_ORDERBYFIELD + " limit "+wo.wp.PAGE_PAGESTART+","+wo.wp.PAGE_PAGERECORDNUM;
// String sqlTmp = "select top "+wo.wp.PAGE_PAGERECORDNUM+"* FROM () WHERE ID NOT IN(SELECT TOP 45000 ID FROM ARTICLE ORDER BY YEAR DESC, ID DESC) ORDER BY YEAR DESC,ID DESC // String sqlTmp = "select top "+wo.wp.PAGE_PAGERECORDNUM+"* FROM () WHERE ID NOT IN(SELECT TOP 45000 ID FROM ARTICLE ORDER BY YEAR DESC, ID DESC) ORDER BY YEAR DESC,ID DESC
String sqlTmp = "select * from (select row_number() over( order by " + wo.wp.SORT_ORDERBYFIELD + ") rownumber,* from (" + wo.wp.sSQL + ") b ) a1 where rownumber between " + (wo.wp.PAGE_PAGESTART + 1) + " and " + (wo.wp.PAGE_PAGESTART + wo.wp.PAGE_PAGERECORDNUM); String sqlTmp = "select * from (select col_number() over( order by " + wo.wp.SORT_ORDERBYFIELD + ") rownumber,* from (" + wo.wp.sSQL + ") b ) a1 where rownumber between " + (wo.wp.PAGE_PAGESTART + 1) + " and " + (wo.wp.PAGE_PAGESTART + wo.wp.PAGE_PAGERECORDNUM);
// String sqlTmp = "select * from (select PAGE_SRCRESULTSET_1.*, row_number() over(order by " + wo.wp.SORT_ORDERBYFIELD + ")" // String sqlTmp = "select * from (select PAGE_SRCRESULTSET_1.*, col_number() over(order by " + wo.wp.SORT_ORDERBYFIELD + ")"
// + " as SORT_INDEXFIELDALIAS from ( " // + " as SORT_INDEXFIELDALIAS from ( "
// + wo.wp.sSQL // + wo.wp.sSQL
// + " ) PAGE_SRCRESULTSET_1 ) PAGE_SRCRESULTSET_2 " // + " ) PAGE_SRCRESULTSET_1 ) PAGE_SRCRESULTSET_2 "
@@ -266,7 +266,7 @@ public class wqlSELECT extends IWQL {
//2.2、对分页进行处理 //2.2、对分页进行处理
if (this.isInQuery && this.isPageQuery) { if (this.isInQuery && this.isPageQuery) {
if ((wo.wp.PAGE_PAGESTART != -99 && wo.wp.PAGE_PAGERECORDNUM != -99) && (wo.wp.SORT_ORDERBYFIELD.length() > 0)) { if ((wo.wp.PAGE_PAGESTART != -99 && wo.wp.PAGE_PAGERECORDNUM != -99) && (wo.wp.SORT_ORDERBYFIELD.length() > 0)) {
String sqlTmp = "select * from (select PAGE_SRCRESULTSET_1.*, row_number() over(order by " + wo.wp.SORT_ORDERBYFIELD + ")" String sqlTmp = "select * from (select PAGE_SRCRESULTSET_1.*, col_number() over(order by " + wo.wp.SORT_ORDERBYFIELD + ")"
+ " as SORT_INDEXFIELDALIAS from ( " + " as SORT_INDEXFIELDALIAS from ( "
+ wo.wp.sSQL + wo.wp.sSQL
+ " ) PAGE_SRCRESULTSET_1 ) PAGE_SRCRESULTSET_2 " + " ) PAGE_SRCRESULTSET_1 ) PAGE_SRCRESULTSET_2 "
@@ -321,7 +321,7 @@ public class wqlSELECT extends IWQL {
Set keySettTempTable = WQLCore.tempTableMap.keySet(); Set keySettTempTable = WQLCore.tempTableMap.keySet();
if (this.isInQuery && this.isPageQuery) { if (this.isInQuery && this.isPageQuery) {
if ((wo.wp.PAGE_PAGESTART != -99 && wo.wp.PAGE_PAGERECORDNUM != -99) && (wo.wp.SORT_ORDERBYFIELD.length() > 0)) { if ((wo.wp.PAGE_PAGESTART != -99 && wo.wp.PAGE_PAGERECORDNUM != -99) && (wo.wp.SORT_ORDERBYFIELD.length() > 0)) {
String sqlTmp = "select * from (select PAGE_SRCRESULTSET_1.*, row_number() over(order by " + wo.wp.SORT_ORDERBYFIELD + ")" String sqlTmp = "select * from (select PAGE_SRCRESULTSET_1.*, col_number() over(order by " + wo.wp.SORT_ORDERBYFIELD + ")"
+ " as SORT_INDEXFIELDALIAS from ( " + " as SORT_INDEXFIELDALIAS from ( "
+ wo.wp.sSQL + wo.wp.sSQL
+ " ) PAGE_SRCRESULTSET_1 ) PAGE_SRCRESULTSET_2 " + " ) PAGE_SRCRESULTSET_1 ) PAGE_SRCRESULTSET_2 "
@@ -374,7 +374,7 @@ public class wqlSELECT extends IWQL {
// String sqlTmp = "select * from("+wo.wp.sSQL+") TOTALRECORDVIEW order by " + wo.wp.SORT_ORDERBYFIELD + " limit "+wo.wp.PAGE_PAGESTART+","+wo.wp.PAGE_PAGERECORDNUM; // String sqlTmp = "select * from("+wo.wp.sSQL+") TOTALRECORDVIEW order by " + wo.wp.SORT_ORDERBYFIELD + " limit "+wo.wp.PAGE_PAGESTART+","+wo.wp.PAGE_PAGERECORDNUM;
String sqlTmp = wo.wp.sSQL + " order by " + wo.wp.SORT_ORDERBYFIELD + " limit " + wo.wp.PAGE_PAGESTART + "," + wo.wp.PAGE_PAGERECORDNUM; String sqlTmp = wo.wp.sSQL + " order by " + wo.wp.SORT_ORDERBYFIELD + " limit " + wo.wp.PAGE_PAGESTART + "," + wo.wp.PAGE_PAGERECORDNUM;
// String sqlTmp = "select * from (select PAGE_SRCRESULTSET_1.*, row_number() over(order by " + wo.wp.SORT_ORDERBYFIELD + ")" // String sqlTmp = "select * from (select PAGE_SRCRESULTSET_1.*, col_number() over(order by " + wo.wp.SORT_ORDERBYFIELD + ")"
// + " as SORT_INDEXFIELDALIAS from ( " // + " as SORT_INDEXFIELDALIAS from ( "
// + wo.wp.sSQL // + wo.wp.sSQL
// + " ) PAGE_SRCRESULTSET_1 ) PAGE_SRCRESULTSET_2 " // + " ) PAGE_SRCRESULTSET_1 ) PAGE_SRCRESULTSET_2 "

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java
View File

@@ -68,10 +68,10 @@ public class PointDto implements Serializable {
private BigDecimal block_num; private BigDecimal block_num;
/** 排 */ /** 排 */
private BigDecimal row_num; private BigDecimal col_num;
/** 列 */ /** 列 */
private BigDecimal col_num; private BigDecimal row_num;
/** 层 */ /** 层 */
private BigDecimal layer_num; private BigDecimal layer_num;

16
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java
View File

@@ -63,12 +63,12 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
if (StrUtil.equals(jsonEnd.getString("region_id"), RegionTypeEnum.DPJQB.getId())) { if (StrUtil.equals(jsonEnd.getString("region_id"), RegionTypeEnum.DPJQB.getId())) {
JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0); JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0);
// 判断此起点是否是等待点 // 判断此起点是否是等待点
if (!StrUtil.equals(jsonStart.getString("row_num"), "9")) { if (!StrUtil.equals(jsonStart.getString("col_num"), "9")) {
// 如果不是等待点更新等待点状态 // 如果不是等待点更新等待点状态
JSONObject jsonEmpWait = pointTab.query("region_id = '" + jsonStart.getString("region_id") + JSONObject jsonEmpWait = pointTab.query("region_id = '" + jsonStart.getString("region_id") +
"' and block_num = '" + jsonStart.getString("block_num") + "' and block_num = '" + jsonStart.getString("block_num") +
"' and col_num = '" + jsonStart.getString("col_num") + "' and row_num = '" + jsonStart.getString("row_num") +
"' and row_num = '9'").uniqueResult(0); "' and col_num = '9'").uniqueResult(0);
jsonEmpWait.put("lock_type", "1"); jsonEmpWait.put("lock_type", "1");
pointTab.update(jsonEmpWait); pointTab.update(jsonEmpWait);
@@ -122,12 +122,12 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
// 判断起点是不是养生A区空载具 // 判断起点是不是养生A区空载具
if (StrUtil.equals(jsonStart.getString("region_id"), RegionTypeEnum.YSAQKTPQ01.getId())) { if (StrUtil.equals(jsonStart.getString("region_id"), RegionTypeEnum.YSAQKTPQ01.getId())) {
// 判断此起点是否是等待点 // 判断此起点是否是等待点
if (!StrUtil.equals(jsonStart.getString("row_num"), "9")) { if (!StrUtil.equals(jsonStart.getString("col_num"), "9")) {
// 如果不是等待点更新等待点状态 // 如果不是等待点更新等待点状态
JSONObject jsonEmpWait = pointTab.query("region_id = '" + jsonStart.getString("region_id") + JSONObject jsonEmpWait = pointTab.query("region_id = '" + jsonStart.getString("region_id") +
"' and block_num = '" + jsonStart.getString("block_num") + "' and block_num = '" + jsonStart.getString("block_num") +
"' and col_num = '" + jsonStart.getString("col_num") + "' and row_num = '" + jsonStart.getString("row_num") +
"' and row_num = '9'").uniqueResult(0); "' and col_num = '9'").uniqueResult(0);
jsonEmpWait.put("lock_type", "1"); jsonEmpWait.put("lock_type", "1");
pointTab.update(jsonEmpWait); pointTab.update(jsonEmpWait);
@@ -233,13 +233,13 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
} else { } else {
// 空托盘暂存区没有就到养生A区找: 先找到出库等待点 // 空托盘暂存区没有就到养生A区找: 先找到出库等待点
JSONObject jsonEmpWait = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + JSONObject jsonEmpWait = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() +
"' and row_num = '9' and can_vehicle_type = '" + vehicle_type + "' and col_num = '9' and can_vehicle_type = '" + vehicle_type +
"' and is_used = '1' and is_delete = '0'").uniqueResult(0); "' and is_used = '1' and is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonEmpWait)) continue; if (ObjectUtil.isEmpty(jsonEmpWait)) continue;
JSONObject jsonStartPoint = pointTab.query("region_id = '" + jsonEmpWait.getString("region_id") + JSONObject jsonStartPoint = pointTab.query("region_id = '" + jsonEmpWait.getString("region_id") +
"' and block_num = '" + jsonEmpWait.getString("block_num") + "' and block_num = '" + jsonEmpWait.getString("block_num") +
"' and col_num = '" + jsonEmpWait.getString("col_num") + "' and row_num = '" + jsonEmpWait.getString("row_num") +
"' and point_status = '2' and lock_type = '1' order by out_empty_seq DESC").uniqueResult(0); "' and point_status = '2' and lock_type = '1' order by out_empty_seq DESC").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonStartPoint)) continue; if (ObjectUtil.isEmpty(jsonStartPoint)) continue;

16
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java
View File

@@ -59,12 +59,12 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
if (StrUtil.equals(jsonEnd.getString("region_id"), RegionTypeEnum.DPJQB.getId())) { if (StrUtil.equals(jsonEnd.getString("region_id"), RegionTypeEnum.DPJQB.getId())) {
JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0); JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0);
// 判断此起点是否是等待点 // 判断此起点是否是等待点
if (!StrUtil.equals(jsonStart.getString("row_num"), "9")) { if (!StrUtil.equals(jsonStart.getString("col_num"), "9")) {
// 如果不是等待点更新等待点状态 // 如果不是等待点更新等待点状态
JSONObject jsonEmpWait = pointTab.query("region_id = '" + jsonStart.getString("region_id") + JSONObject jsonEmpWait = pointTab.query("region_id = '" + jsonStart.getString("region_id") +
"' and block_num = '" + jsonStart.getString("block_num") + "' and block_num = '" + jsonStart.getString("block_num") +
"' and col_num = '" + jsonStart.getString("col_num") + "' and row_num = '" + jsonStart.getString("row_num") +
"' and row_num = '9'").uniqueResult(0); "' and col_num = '9'").uniqueResult(0);
jsonEmpWait.put("lock_type", "1"); jsonEmpWait.put("lock_type", "1");
pointTab.update(jsonEmpWait); pointTab.update(jsonEmpWait);
@@ -118,12 +118,12 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
// 判断起点是不是养生A区空载具 // 判断起点是不是养生A区空载具
if (StrUtil.equals(jsonStart.getString("region_id"), RegionTypeEnum.YSAQKTPQ01.getId())) { if (StrUtil.equals(jsonStart.getString("region_id"), RegionTypeEnum.YSAQKTPQ01.getId())) {
// 判断此起点是否是等待点 // 判断此起点是否是等待点
if (!StrUtil.equals(jsonStart.getString("row_num"), "9")) { if (!StrUtil.equals(jsonStart.getString("col_num"), "9")) {
// 如果不是等待点更新等待点状态 // 如果不是等待点更新等待点状态
JSONObject jsonEmpWait = pointTab.query("region_id = '" + jsonStart.getString("region_id") + JSONObject jsonEmpWait = pointTab.query("region_id = '" + jsonStart.getString("region_id") +
"' and block_num = '" + jsonStart.getString("block_num") + "' and block_num = '" + jsonStart.getString("block_num") +
"' and col_num = '" + jsonStart.getString("col_num") + "' and row_num = '" + jsonStart.getString("row_num") +
"' and row_num = '9'").uniqueResult(0); "' and col_num = '9'").uniqueResult(0);
jsonEmpWait.put("lock_type", "1"); jsonEmpWait.put("lock_type", "1");
pointTab.update(jsonEmpWait); pointTab.update(jsonEmpWait);
@@ -241,13 +241,13 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
} else { } else {
// 空托盘暂存区没有就到养生A区找: 先找到出库等待点 // 空托盘暂存区没有就到养生A区找: 先找到出库等待点
JSONObject jsonEmpWait = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + JSONObject jsonEmpWait = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() +
"' and row_num = '9' and can_vehicle_type = '" + vehicle_type + "' and col_num = '9' and can_vehicle_type = '" + vehicle_type +
"' and is_used = '1' and is_delete = '0'").uniqueResult(0); "' and is_used = '1' and is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonEmpWait)) continue; if (ObjectUtil.isEmpty(jsonEmpWait)) continue;
JSONObject jsonStartPoint = pointTab.query("region_id = '" + jsonEmpWait.getString("region_id") + JSONObject jsonStartPoint = pointTab.query("region_id = '" + jsonEmpWait.getString("region_id") +
"' and block_num = '" + jsonEmpWait.getString("block_num") + "' and block_num = '" + jsonEmpWait.getString("block_num") +
"' and col_num = '" + jsonEmpWait.getString("col_num") + "' and row_num = '" + jsonEmpWait.getString("row_num") +
"' and point_status = '2' and lock_type = '1' order by out_empty_seq DESC").uniqueResult(0); "' and point_status = '2' and lock_type = '1' order by out_empty_seq DESC").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonStartPoint)) continue; if (ObjectUtil.isEmpty(jsonStartPoint)) continue;

6
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/wql/QSCH_yqxCallMAterial_01.wql
View File

@@ -47,8 +47,8 @@
p.point_code, p.point_code,
p.point_name, p.point_name,
p.block_num, p.block_num,
p.row_num, p.col_num,
p.col_num p.row_num
FROM FROM
ST_IVT_StructIvt ivt ST_IVT_StructIvt ivt
LEFT JOIN SCH_BASE_Point p on ivt.point_id = p.point_id LEFT JOIN SCH_BASE_Point p on ivt.point_id = p.point_id
@@ -65,7 +65,7 @@
OPTION 输入.vehicle_type <> "" OPTION 输入.vehicle_type <> ""
p.can_vehicle_type like 输入.vehicle_type p.can_vehicle_type like 输入.vehicle_type
ENDOPTION ENDOPTION
ORDER BY block_num,row_num desc,col_num ORDER BY block_num,col_num desc,row_num
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF ENDIF

14
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java
View File

@@ -276,13 +276,13 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask {
end_code = jsonZcwEnd.getString("point_code"); end_code = jsonZcwEnd.getString("point_code");
} else { } else {
// 为空就去养生A区的等待位 // 为空就去养生A区的等待位
JSONObject jsonEmpWait = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and row_num = '1' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").uniqueResult(0); JSONObject jsonEmpWait = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and col_num = '1' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonEmpWait)) { if (ObjectUtil.isNotEmpty(jsonEmpWait)) {
// 判断是否有任务 // 判断是否有任务
boolean is_point = this.isTask(jsonEmpWait.getString("point_code")); boolean is_point = this.isTask(jsonEmpWait.getString("point_code"));
if (is_point) { if (is_point) {
JSONArray jsonEmpArr = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and col_num = '" + jsonEmpWait.getString("col_num") + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").getResultJSONArray(0); JSONArray jsonEmpArr = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and row_num = '" + jsonEmpWait.getString("row_num") + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").getResultJSONArray(0);
if (ObjectUtil.isNotEmpty(jsonEmpArr)) end_code = jsonEmpWait.getString("point_code"); if (ObjectUtil.isNotEmpty(jsonEmpArr)) end_code = jsonEmpWait.getString("point_code");
} }
} }
@@ -295,13 +295,13 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask {
end_code = jsonZcwEnd.getString("point_code"); end_code = jsonZcwEnd.getString("point_code");
} else { } else {
// 为空就去养生A区的等待位 // 为空就去养生A区的等待位
JSONObject jsonEmpWait = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and row_num = '1' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").uniqueResult(0); JSONObject jsonEmpWait = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and col_num = '1' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonEmpWait)) { if (ObjectUtil.isNotEmpty(jsonEmpWait)) {
// 判断是否有任务 // 判断是否有任务
boolean is_point = this.isTask(jsonEmpWait.getString("point_code")); boolean is_point = this.isTask(jsonEmpWait.getString("point_code"));
if (is_point) { if (is_point) {
JSONArray jsonEmpArr = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and col_num = '" + jsonEmpWait.getString("col_num") + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").getResultJSONArray(0); JSONArray jsonEmpArr = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and row_num = '" + jsonEmpWait.getString("row_num") + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").getResultJSONArray(0);
if (ObjectUtil.isNotEmpty(jsonEmpArr)) end_code = jsonEmpWait.getString("point_code"); if (ObjectUtil.isNotEmpty(jsonEmpArr)) end_code = jsonEmpWait.getString("point_code");
} }
} }
@@ -353,7 +353,7 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask {
// 根据 区域、块、列找到第一个有物料的货位 // 根据 区域、块、列找到第一个有物料的货位
JSONObject jsonOnePoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") + JSONObject jsonOnePoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") +
"' and block_num = '" + jsonPoint2.getString("block_num") + "' and block_num = '" + jsonPoint2.getString("block_num") +
"' and col_num = '" + jsonPoint2.getString("col_num") + "' and row_num = '" + jsonPoint2.getString("row_num") +
"' and point_code <> '" + jsonPoint2.getString("point_code") + "' and point_code <> '" + jsonPoint2.getString("point_code") +
"' and point_status = '2' and lock_type = '1' order by in_empty_seq ASC").uniqueResult(0); "' and point_status = '2' and lock_type = '1' order by in_empty_seq ASC").uniqueResult(0);
@@ -361,7 +361,7 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask {
if (ObjectUtil.isEmpty(jsonOnePoint)) { if (ObjectUtil.isEmpty(jsonOnePoint)) {
JSONObject jsonEmpPoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") + JSONObject jsonEmpPoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") +
"' and block_num = '" + jsonPoint2.getString("block_num") + "' and block_num = '" + jsonPoint2.getString("block_num") +
"' and col_num = '" + jsonPoint2.getString("col_num") + "' and row_num = '" + jsonPoint2.getString("row_num") +
"' and point_code <> '" + jsonPoint2.getString("point_code") + "' and point_code <> '" + jsonPoint2.getString("point_code") +
"' and point_status = '1' and lock_type = '1' order by in_empty_seq DESC").uniqueResult(0); "' and point_status = '1' and lock_type = '1' order by in_empty_seq DESC").uniqueResult(0);
@@ -376,7 +376,7 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask {
JSONObject jsonEmpPoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") + JSONObject jsonEmpPoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") +
"' and block_num = '" + jsonPoint2.getString("block_num") + "' and block_num = '" + jsonPoint2.getString("block_num") +
"' and col_num = '" + jsonPoint2.getString("col_num") + "' and row_num = '" + jsonPoint2.getString("row_num") +
"' and point_code <> '" + jsonPoint2.getString("point_code") + "' and point_code <> '" + jsonPoint2.getString("point_code") +
"' and in_empty_seq = '" + in_empty_seq + "' and in_empty_seq = '" + in_empty_seq +
"' and point_status = '1' and lock_type = '1'").uniqueResult(0); "' and point_status = '1' and lock_type = '1'").uniqueResult(0);

14
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java
View File

@@ -228,13 +228,13 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask {
end_code = jsonZcwEnd.getString("point_code"); end_code = jsonZcwEnd.getString("point_code");
} else { } else {
// 为空就去养生A区的等待位 // 为空就去养生A区的等待位
JSONObject jsonEmpWait = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and row_num = '1' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").uniqueResult(0); JSONObject jsonEmpWait = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and col_num = '1' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonEmpWait)) { if (ObjectUtil.isNotEmpty(jsonEmpWait)) {
// 判断是否有任务 // 判断是否有任务
boolean is_point = this.isTask(jsonEmpWait.getString("point_code")); boolean is_point = this.isTask(jsonEmpWait.getString("point_code"));
if (is_point) { if (is_point) {
JSONArray jsonEmpArr = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and col_num = '" + jsonEmpWait.getString("col_num") + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").getResultJSONArray(0); JSONArray jsonEmpArr = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and row_num = '" + jsonEmpWait.getString("row_num") + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").getResultJSONArray(0);
if (ObjectUtil.isNotEmpty(jsonEmpArr)) end_code = jsonEmpWait.getString("point_code"); if (ObjectUtil.isNotEmpty(jsonEmpArr)) end_code = jsonEmpWait.getString("point_code");
} }
} }
@@ -247,13 +247,13 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask {
end_code = jsonZcwEnd.getString("point_code"); end_code = jsonZcwEnd.getString("point_code");
} else { } else {
// 为空就去养生A区的等待位 // 为空就去养生A区的等待位
JSONObject jsonEmpWait = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and row_num = '1' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").uniqueResult(0); JSONObject jsonEmpWait = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and col_num = '1' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonEmpWait)) { if (ObjectUtil.isNotEmpty(jsonEmpWait)) {
// 判断是否有任务 // 判断是否有任务
boolean is_point = this.isTask(jsonEmpWait.getString("point_code")); boolean is_point = this.isTask(jsonEmpWait.getString("point_code"));
if (is_point) { if (is_point) {
JSONArray jsonEmpArr = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and col_num = '" + jsonEmpWait.getString("col_num") + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").getResultJSONArray(0); JSONArray jsonEmpArr = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and row_num = '" + jsonEmpWait.getString("row_num") + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").getResultJSONArray(0);
if (ObjectUtil.isNotEmpty(jsonEmpArr)) end_code = jsonEmpWait.getString("point_code"); if (ObjectUtil.isNotEmpty(jsonEmpArr)) end_code = jsonEmpWait.getString("point_code");
} }
} }
@@ -305,7 +305,7 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask {
// 根据 区域、块、列找到第一个有物料的货位 // 根据 区域、块、列找到第一个有物料的货位
JSONObject jsonOnePoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") + JSONObject jsonOnePoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") +
"' and block_num = '" + jsonPoint2.getString("block_num") + "' and block_num = '" + jsonPoint2.getString("block_num") +
"' and col_num = '" + jsonPoint2.getString("col_num") + "' and row_num = '" + jsonPoint2.getString("row_num") +
"' and point_code <> '" + jsonPoint2.getString("point_code") + "' and point_code <> '" + jsonPoint2.getString("point_code") +
"' and point_status = '2' and lock_type = '1' order by in_empty_seq ASC").uniqueResult(0); "' and point_status = '2' and lock_type = '1' order by in_empty_seq ASC").uniqueResult(0);
@@ -313,7 +313,7 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask {
if (ObjectUtil.isEmpty(jsonOnePoint)) { if (ObjectUtil.isEmpty(jsonOnePoint)) {
JSONObject jsonEmpPoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") + JSONObject jsonEmpPoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") +
"' and block_num = '" + jsonPoint2.getString("block_num") + "' and block_num = '" + jsonPoint2.getString("block_num") +
"' and col_num = '" + jsonPoint2.getString("col_num") + "' and row_num = '" + jsonPoint2.getString("row_num") +
"' and point_code <> '" + jsonPoint2.getString("point_code") + "' and point_code <> '" + jsonPoint2.getString("point_code") +
"' and point_status = '1' and lock_type = '1' order by in_empty_seq DESC").uniqueResult(0); "' and point_status = '1' and lock_type = '1' order by in_empty_seq DESC").uniqueResult(0);
@@ -328,7 +328,7 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask {
JSONObject jsonEmpPoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") + JSONObject jsonEmpPoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") +
"' and block_num = '" + jsonPoint2.getString("block_num") + "' and block_num = '" + jsonPoint2.getString("block_num") +
"' and col_num = '" + jsonPoint2.getString("col_num") + "' and row_num = '" + jsonPoint2.getString("row_num") +
"' and point_code <> '" + jsonPoint2.getString("point_code") + "' and point_code <> '" + jsonPoint2.getString("point_code") +
"' and in_empty_seq = '" + in_empty_seq + "' and in_empty_seq = '" + in_empty_seq +
"' and point_status = '1' and lock_type = '1'").uniqueResult(0); "' and point_status = '1' and lock_type = '1'").uniqueResult(0);

14
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java
View File

@@ -183,7 +183,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
if (ObjectUtil.isNotEmpty(taskIng) && ObjectUtil.isNotEmpty(json1)) { if (ObjectUtil.isNotEmpty(taskIng) && ObjectUtil.isNotEmpty(json1)) {
JSONObject point2 = pointTab.query("point_code = '" + taskIng.getString("point_code2") + "'").uniqueResult(0); JSONObject point2 = pointTab.query("point_code = '" + taskIng.getString("point_code2") + "'").uniqueResult(0);
if (StrUtil.equals(point2.getString("block_num"), json1.getString("block_num")) if (StrUtil.equals(point2.getString("block_num"), json1.getString("block_num"))
&& StrUtil.equals(point2.getString("col_num"), json1.getString("col_num"))) { && StrUtil.equals(point2.getString("row_num"), json1.getString("row_num"))) {
taskObj.put("remark", "相应列有AGV在工作,等待执行!"); taskObj.put("remark", "相应列有AGV在工作,等待执行!");
taskObj.put("update_time", DateUtil.now()); taskObj.put("update_time", DateUtil.now());
taskTab.update(taskObj); taskTab.update(taskObj);
@@ -194,10 +194,10 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
if (ObjectUtil.isNotEmpty(json1)) { if (ObjectUtil.isNotEmpty(json1)) {
Integer block_num = json1.getInteger("block_num"); Integer block_num = json1.getInteger("block_num");
Integer row_num = json1.getInteger("row_num");
Integer col_num = json1.getInteger("col_num"); Integer col_num = json1.getInteger("col_num");
Integer row_num = json1.getInteger("row_num");
JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and col_num = '" + col_num + "' and row_num ='" + (row_num - 1) + "'").uniqueResult(0); JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and row_num = '" + row_num + "' and col_num ='" + (col_num - 1) + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(firstRow)) throw new BadRequestException("数据错误，请校验!"); if (ObjectUtil.isEmpty(firstRow)) throw new BadRequestException("数据错误，请校验!");
taskObj.put("point_code2", firstRow.getString("point_code")); taskObj.put("point_code2", firstRow.getString("point_code"));
taskObj.put("update_time", DateUtil.now()); taskObj.put("update_time", DateUtil.now());
@@ -208,7 +208,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
JSONObject point = new JSONObject(); JSONObject point = new JSONObject();
point.put("lock_type", "2"); point.put("lock_type", "2");
point.put("task_id", taskObj.getString("task_id")); point.put("task_id", taskObj.getString("task_id"));
pointTab.update(point, "block_num = '" + block_num + "' and col_num = '" + col_num + "' and row_num <= '" + (row_num - 1) + "'"); pointTab.update(point, "block_num = '" + block_num + "' and row_num = '" + row_num + "' and col_num <= '" + (col_num - 1) + "'");
} else {//找空位入 } else {//找空位入
if (ObjectUtil.isNotEmpty(taskIngs) && taskIngs.size() > 1) { if (ObjectUtil.isNotEmpty(taskIngs) && taskIngs.size() > 1) {
@@ -230,8 +230,8 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
taskTab.update(taskObj); taskTab.update(taskObj);
} else { } else {
Integer block_num = json2.getInteger("block_num"); Integer block_num = json2.getInteger("block_num");
Integer col_num = json2.getInteger("col_num"); Integer row_num = json2.getInteger("row_num");
JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and col_num = '" + col_num + "' and row_num ='9'").uniqueResult(0); JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and row_num = '" + row_num + "' and col_num ='9'").uniqueResult(0);
taskObj.put("point_code2", firstRow.getString("point_code")); taskObj.put("point_code2", firstRow.getString("point_code"));
//二楼普通任务 //二楼普通任务
taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
@@ -241,7 +241,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
JSONObject point = new JSONObject(); JSONObject point = new JSONObject();
point.put("lock_type", "2"); point.put("lock_type", "2");
point.put("task_id", taskObj.getString("task_id")); point.put("task_id", taskObj.getString("task_id"));
pointTab.update(point, "block_num = '" + block_num + "' and col_num = '" + col_num + "' and row_num <= '" + 9 + "'"); pointTab.update(point, "block_num = '" + block_num + "' and row_num = '" + row_num + "' and col_num <= '" + 9 + "'");
} }
} }

15
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql
View File

@@ -48,8 +48,8 @@
p.point_code, p.point_code,
p.point_name, p.point_name,
p.block_num, p.block_num,
p.row_num, p.col_num,
p.col_num p.row_num
FROM FROM
SCH_BASE_Point p SCH_BASE_Point p
where where
@@ -57,7 +57,7 @@
AND is_delete = '0' AND is_delete = '0'
AND lock_type = '1' AND lock_type = '1'
AND point_status = '3' AND point_status = '3'
and row_num>1 and col_num>1
OPTION 输入.material_id <> "" OPTION 输入.material_id <> ""
p.material_id = 输入.material_id p.material_id = 输入.material_id
ENDOPTION ENDOPTION
@@ -67,7 +67,7 @@
OPTION 输入.vehicle_type <> "" OPTION 输入.vehicle_type <> ""
p.can_vehicle_type like 输入.vehicle_type p.can_vehicle_type like 输入.vehicle_type
ENDOPTION ENDOPTION
ORDER BY block_num,col_num,row_num ORDER BY block_num,row_num,col_num
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF ENDIF
@@ -76,7 +76,7 @@
QUERY QUERY
SELECT SELECT
block_num, block_num,
col_num, row_num,
COUNT(*) AS sum COUNT(*) AS sum
FROM FROM
SCH_BASE_Point p SCH_BASE_Point p
@@ -86,13 +86,12 @@
AND region_code = 'YSQA01' AND region_code = 'YSQA01'
AND point_status = '1' AND point_status = '1'
AND lock_type = '1' AND lock_type = '1'
AND ( row_num = 1 OR row_num )
OPTION 输入.vehicle_type <> "" OPTION 输入.vehicle_type <> ""
p.can_vehicle_type like 输入.vehicle_type p.can_vehicle_type like 输入.vehicle_type
ENDOPTION ENDOPTION
GROUP BY block_num,col_num GROUP BY block_num,row_num
HAVING sum = 9 HAVING sum = 9
ORDER BY block_num,col_num ORDER BY block_num,row_num
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF ENDIF

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_hkxSendMaterial_01.wql
View File

@@ -60,7 +60,7 @@
OPTION 输入.region_code <> "" OPTION 输入.region_code <> ""
p.region_code = 输入.region_code p.region_code = 输入.region_code
ENDOPTION ENDOPTION
ORDER BY row_num,col_num,layer_num ORDER BY col_num,row_num,layer_num
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF ENDIF

2
lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/impl/StructivtServiceImpl.java
View File

@@ -53,8 +53,8 @@ public class StructivtServiceImpl implements StructivtService {
map.put("material_code", "%" + whereJson.get("material_code") + "%"); map.put("material_code", "%" + whereJson.get("material_code") + "%");
} }
map.put("layer_num", whereJson.get("layer_num")); map.put("layer_num", whereJson.get("layer_num"));
map.put("row_num", whereJson.get("row_num"));
map.put("col_num", whereJson.get("col_num")); map.put("col_num", whereJson.get("col_num"));
map.put("row_num", whereJson.get("row_num"));
map.put("is_used", whereJson.get("is_used")); map.put("is_used", whereJson.get("is_used"));
map.put("lock_type", whereJson.get("lock_type")); map.put("lock_type", whereJson.get("lock_type"));
map.put("point_status", whereJson.get("point_status")); map.put("point_status", whereJson.get("point_status"));

6
lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/wql/ST_IVT_STRUCTIVT.wql
View File

@@ -81,12 +81,12 @@
OPTION 输入.layer_num <> "" OPTION 输入.layer_num <> ""
point.layer_num = 输入.layer_num point.layer_num = 输入.layer_num
ENDOPTION ENDOPTION
OPTION 输入.row_num <> ""
point.row_num = 输入.row_num
ENDOPTION
OPTION 输入.col_num <> "" OPTION 输入.col_num <> ""
point.col_num = 输入.col_num point.col_num = 输入.col_num
ENDOPTION ENDOPTION
OPTION 输入.row_num <> ""
point.row_num = 输入.row_num
ENDOPTION
OPTION 输入.lock_type <> "" OPTION 输入.lock_type <> ""
point.lock_type = 输入.lock_type point.lock_type = 输入.lock_type
ENDOPTION ENDOPTION