解决冲突

7 years ago · 55093f22d7
parent ab9a0aae5d
commit 55093f22d7
1 changed files with 4 additions and 1 deletions
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@ -1174,9 +1174,12 @@ public class WmsHqlPack {
        //作业流程id（对应作业记录明细里自增的id）
        HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(),"alId",result);
        HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(),"seq",result);
+        HqlPack.getNumEqualPack(wmsActionLogDetails.getOkSeq(), "okSeq", result);
+        HqlPack.getNumEqualPack(wmsActionLogDetails.getNgSeq(), "ngSeq", result);
+        HqlPack.getNumEqualPack(wmsActionLogDetails.getValueType(), "valueType", result);

        getStringBuilderPack(wmsActionLogDetails, result);

-        return  result.toString();
+        return result.toString();
    }
 }