解决冲突

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1223,4 +1223,19 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
+    /**
+     *  按moveNo 取最后一笔插入的数据
+     * @param wmsMoveSn
+     * @return
+     */
+    public static String packHqlLastWmsMoveSn(WmsMoveSn wmsMoveSn) {
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(),"orderNo", result);
+        getStringBuilderPack(wmsMoveSn, result);
+        HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
+
+        return result.toString();
+    }
 }